Nested buttons need ArgumentTemplate love too

programcsharp · Jan 12, 2018 · b2a4071 · b2a4071
1 parent eaa36a5
commit b2a4071
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/Build/CommonAssemblyInfo.cs b/Build/CommonAssemblyInfo.cs
@@ -15,6 +15,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.0.1")]
-[assembly: AssemblyFileVersion("2.0.1")]
+[assembly: AssemblyVersion("2.0.2")]
+[assembly: AssemblyFileVersion("2.0.2")]
 //[assembly: AssemblyInformationalVersion("2.0-alpha6")]
diff --git a/Griddly/Views/Shared/Griddly/BootstrapButton.cshtml b/Griddly/Views/Shared/Griddly/BootstrapButton.cshtml
@@ -10,12 +10,6 @@
  *@
 
 @model GriddlyButton
-@{
-    if (Model.ArgumentTemplate != null)
-    {
-        Model.Argument = Model.ArgumentTemplate(ViewData["ResolveContext"]).ToString();
-    }
-}
 @if (Model is GriddlyHtmlButton)
 {
     @(((GriddlyHtmlButton)Model).HtmlTemplate(Model))
@@ -56,6 +50,11 @@ else
 
 @helper RenderLink(GriddlyButton button, bool isDropdown, bool isMenuItem)
 {
+    if (button.ArgumentTemplate != null)
+    {
+        button.Argument = button.ArgumentTemplate(ViewData["ResolveContext"]).ToString();
+    }
+
     string href = null;
     if (button.Action != GriddlyButtonAction.Modal && (button.Action != GriddlyButtonAction.Navigate || (isDropdown && button.DropdownCaret != GriddlyDropdownCaret.Split)))
     {