Load settings by Property/UniqueID improved

radzenhq · Aug 10, 2023 · b673cbe · b673cbe
1 parent 1a595c5
commit b673cbe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Radzen.Blazor/RadzenDataGrid.razor.cs b/Radzen.Blazor/RadzenDataGrid.razor.cs
@@ -2922,8 +2922,8 @@ internal async Task LoadSettings(DataGridSettings settings)
                 {
                     foreach (var column in settings.Columns.OrderBy(c => c.SortIndex))
                     {
-                        var gridColumn = ColumnsCollection.Where(c => c.Property == column.Property).FirstOrDefault() ??
-                                ColumnsCollection.Where(c => c.UniqueID == column.UniqueID).FirstOrDefault();
+                        var gridColumn = ColumnsCollection.Where(c => !string.IsNullOrEmpty(column.Property) && c.Property == column.Property).FirstOrDefault() ??
+                                ColumnsCollection.Where(c => !string.IsNullOrEmpty(column.UniqueID) && c.UniqueID == column.UniqueID).FirstOrDefault();
                         if (gridColumn != null)
                         {
                             // Sorting
@@ -2937,8 +2937,8 @@ internal async Task LoadSettings(DataGridSettings settings)
 
                     foreach (var column in settings.Columns)
                     {
-                        var gridColumn = ColumnsCollection.Where(c => c.Property == column.Property).FirstOrDefault() ??
-                                ColumnsCollection.Where(c => c.UniqueID == column.UniqueID).FirstOrDefault();
+                        var gridColumn = ColumnsCollection.Where(c => !string.IsNullOrEmpty(column.Property) && c.Property == column.Property).FirstOrDefault() ??
+                                ColumnsCollection.Where(c => !string.IsNullOrEmpty(column.UniqueID) && c.UniqueID == column.UniqueID).FirstOrDefault();
                         if (gridColumn != null)
                         {
                             // Visibility

diff --git a/RadzenBlazorDemos/Pages/DataGridSaveSettings.razor b/RadzenBlazorDemos/Pages/DataGridSaveSettings.razor
@@ -20,7 +20,7 @@
                 AllowColumnResize="true" AllowColumnReorder="true" ColumnWidth="200px"
                 FilterPopupRenderMode="PopupRenderMode.OnDemand" FilterCaseSensitivity="FilterCaseSensitivity.CaseInsensitive" Data="@employees" TItem="Employee">
     <Columns>
-        <RadzenDataGridColumn TItem="Employee" Title="Employee" Sortable="false" Filterable="false">
+        <RadzenDataGridColumn TItem="Employee" Title="Employee" Sortable="false" Filterable="false" UniqueID="Employee">
             <Template Context="data">
                 <RadzenImage Path="@data.Photo" style="width: 40px; height: 40px; border-radius: 8px; margin-right: 8px;" />
                 @data.FirstName @data.LastName