Przeglądaj źródła

DynamicDataGrid.LoadItem now uses LoadEditorColumns

Kenric Nugteren 1 rok temu
rodzic
commit
eaad93c6b8
1 zmienionych plików z 6 dodań i 6 usunięć
  1. 6 6
      inabox.wpf/DynamicGrid/DynamicDataGrid.cs

+ 6 - 6
inabox.wpf/DynamicGrid/DynamicDataGrid.cs

@@ -302,8 +302,8 @@ namespace InABox.DynamicGrid
                 }
 
                 var columns = LoadEditorColumns(); // new Columns<TEntity>().Default(ColumnType.IncludeOptional, ColumnType.IncludeForeignKeys, ColumnType.IncludeUserProperties);
-                var data = new Client<TEntity>().Query(filter, columns);
-                results.AddRange(data.Rows.Select(x => x.ToObject<TEntity>()));
+                var data = Client.Query(filter, columns);
+                results.AddRange(data.ToObjects<TEntity>());
             }
 
             return results.ToArray();
@@ -313,18 +313,18 @@ namespace InABox.DynamicGrid
         {
             var id = row.Get<TEntity, Guid>(x => x.ID);
             var filter = GetRowFilter(row);//new Filter<TEntity>(x => x.ID).IsEqualTo(id);
-            return new Client<TEntity>().Load(filter).FirstOrDefault()
+            return Client.Query(filter, LoadEditorColumns()).ToObjects<TEntity>().FirstOrDefault()
                 ?? throw new Exception($"No {typeof(TEntity).Name} with ID {id}");
         }
 
         public override void SaveItem(TEntity item)
         {
-            new Client<TEntity>().Save(item, "Edited by User");
+            Client.Save(item, "Edited by User");
         }
 
         public override void SaveItems(TEntity[] items)
         {
-            new Client<TEntity>().Save(items, "Edited by User");
+            Client.Save(items, "Edited by User");
         }
 
         protected override void DeleteItems(params CoreRow[] rows)
@@ -342,7 +342,7 @@ namespace InABox.DynamicGrid
                 deletes.Add(delete);
             }
 
-            new Client<TEntity>().Delete(deletes, "Deleted on User Request");
+            Client.Delete(deletes, "Deleted on User Request");
         }
 
         private object GetPropertyValue(Expression member, object obj)