Skip to content

Commit b2a4071

Browse files
committed
Nested buttons need ArgumentTemplate love too
1 parent eaa36a5 commit b2a4071

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

Build/CommonAssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
//
1616
// You can specify all the values or you can default the Revision and Build Numbers
1717
// by using the '*' as shown below:
18-
[assembly: AssemblyVersion("2.0.1")]
19-
[assembly: AssemblyFileVersion("2.0.1")]
18+
[assembly: AssemblyVersion("2.0.2")]
19+
[assembly: AssemblyFileVersion("2.0.2")]
2020
//[assembly: AssemblyInformationalVersion("2.0-alpha6")]

Griddly/Views/Shared/Griddly/BootstrapButton.cshtml

+5-6
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@
1010
*@
1111

1212
@model GriddlyButton
13-
@{
14-
if (Model.ArgumentTemplate != null)
15-
{
16-
Model.Argument = Model.ArgumentTemplate(ViewData["ResolveContext"]).ToString();
17-
}
18-
}
1913
@if (Model is GriddlyHtmlButton)
2014
{
2115
@(((GriddlyHtmlButton)Model).HtmlTemplate(Model))
@@ -56,6 +50,11 @@ else
5650

5751
@helper RenderLink(GriddlyButton button, bool isDropdown, bool isMenuItem)
5852
{
53+
if (button.ArgumentTemplate != null)
54+
{
55+
button.Argument = button.ArgumentTemplate(ViewData["ResolveContext"]).ToString();
56+
}
57+
5958
string href = null;
6059
if (button.Action != GriddlyButtonAction.Modal && (button.Action != GriddlyButtonAction.Navigate || (isDropdown && button.DropdownCaret != GriddlyDropdownCaret.Split)))
6160
{

0 commit comments

Comments
 (0)