Skip to content

Commit 8801e6d

Browse files
committed
Default ClearSelectionOnAction to true for ajax buttons, false otherwise
1 parent bf8ccb1 commit 8801e6d

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

Build/CommonAssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
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("1.4.3")]
19-
[assembly: AssemblyFileVersion("1.4.3")]
18+
[assembly: AssemblyVersion("1.4.4")]
19+
[assembly: AssemblyFileVersion("1.4.4")]

Griddly.Mvc/GriddlyButton.cs

+3-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ public GriddlyButton(string additionalClassName = null)
1212

1313
Enabled = true;
1414
Action = GriddlyButtonAction.Navigate;
15-
ClearSelectionOnAction = true;
1615

1716
ClassName = ((GriddlySettings.DefaultButtonClassName ?? "") + " " + (additionalClassName ?? "")).Trim();
1817
}
@@ -26,9 +25,9 @@ public GriddlyButton(string additionalClassName = null)
2625
public bool IsSplitDropdown { get; set; }
2726

2827
/// <summary>
29-
/// Clear the current row selections after this button is activated (default: true)
28+
/// Clear the current row selections after this button is activated (default: null). If null, will be determined during render -- true for ajax buttons and false otherwise.
3029
/// </summary>
31-
public bool ClearSelectionOnAction { get; set; }
30+
public bool? ClearSelectionOnAction { get; set; }
3231

3332
public string Text { get; set; }
3433
public string Title { get; set; }
@@ -37,7 +36,7 @@ public GriddlyButton(string additionalClassName = null)
3736
public string Target { get; set; }
3837
public string ConfirmMessage { get; set; }
3938
public bool AlignRight { get; set; }
40-
39+
4140
/// <summary>
4241
/// The row ids to include in the button action (default uses grid default)
4342
/// </summary>

Griddly/Views/Shared/Griddly/BootstrapButton.cshtml

+3-1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ else
6565
{
6666
href = "#" + button.Argument;
6767
}
68+
69+
bool clearSelectionOnAction = button.ClearSelectionOnAction ?? (button.Action == GriddlyButtonAction.Ajax || button.Action == GriddlyButtonAction.AjaxBulk);
6870

6971
<a data-role="griddly-button" class="@(!isMenuItem ? "btn btn-default" : null) @(isDropdown && !button.IsSplitDropdown ? "dropdown-toggle" : null) @(!button.Enabled || button.EnableOnSelection == true ? "disabled" : null) @button.ClassName @(!string.IsNullOrWhiteSpace(button.Icon) ? "btn-with-icon" : null)"
7072
@*onclick="@(button.Action == GriddlyButtonAction.Javascript ? button.Argument : null)"*@
@@ -77,7 +79,7 @@ else
7779
@Html.AttributeIf("data-url", button.Action == GriddlyButtonAction.Ajax || button.Action == GriddlyButtonAction.AjaxBulk || button.Action == GriddlyButtonAction.Post || button.Action == GriddlyButtonAction.PostCriteria, button.Argument)
7880
@Html.AttributeIf("data-target", button.Action != GriddlyButtonAction.Navigate && !string.IsNullOrWhiteSpace(button.Target), button.Target)
7981
@Html.AttributeIf("data-enable-on-selection", button.EnableOnSelection, button.EnableOnSelection.ToString().ToLower())
80-
@Html.AttributeIf("data-clear-selection-on-action", button.ClearSelectionOnAction, button.ClearSelectionOnAction.ToString().ToLower())
82+
@Html.AttributeIf("data-clear-selection-on-action", clearSelectionOnAction, clearSelectionOnAction.ToString().ToLower())
8183
@Html.AttributeIf("data-confirm-message", button.ConfirmMessage != null, button.ConfirmMessage)
8284
@Html.AttributeIf("data-rowids", button.RowIds != null, button.RowIds != null ? Html.AttributeEncode(Json.Encode(button.RowIds.Select(x => x.ToLower()).ToArray())) : null)
8385
@Html.AttributeIf("data-append-rowids-to-url", (button.Action == GriddlyButtonAction.Modal || button.Action == GriddlyButtonAction.Navigate) && button.AppendRowIdsToUrl, "")

0 commit comments

Comments
 (0)