applied the #110 fix to SQL data source & the 'get by keys' method no…

…w return data in the DotNet and SQL data-sources
uComponents · Apr 20, 2017 · 24de556 · 24de556
1 parent bffe39e
commit 24de556
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/source/nuPickers/Shared/DotNetDataSource/DotNetDataSource.cs b/source/nuPickers/Shared/DotNetDataSource/DotNetDataSource.cs
@@ -25,12 +25,13 @@ public class DotNetDataSource : IDataSource
 
         public IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parentId, string typeahead)
         {
-            return this.GetEditorDataItems(currentId == 0 ? parentId : currentId); // fix from PR #110
+            return this.GetEditorDataItems(currentId == 0 ? parentId : currentId, typeahead); // fix from PR #110
         }
 
         public IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parentId, string[] keys)
         {
-            return Enumerable.Empty<EditorDataItem>();
+            return this.GetEditorDataItems(currentId == 0 ? parentId : currentId).Where(x => keys.Contains(x.Key));
+            //TODO: update public IDotNetDataSource so keys can be passed though (so it can do a more efficient query)
         }
 
         [Obsolete("[v2.0.0]")]

diff --git a/source/nuPickers/Shared/SqlDataSource/SqlDataSource.cs b/source/nuPickers/Shared/SqlDataSource/SqlDataSource.cs
@@ -23,12 +23,12 @@ public class SqlDataSource : IDataSource
 
         public IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parentId, string typeahead)
         {
-            return this.GetEditorDataItems(currentId, typeahead);
+            return this.GetEditorDataItems(currentId == 0 ? parentId : currentId, typeahead);
         }
 
         public IEnumerable<EditorDataItem> GetEditorDataItems(int currentId, int parentId, string[] keys)
         {
-            return Enumerable.Empty<EditorDataItem>();
+            return this.GetEditorDataItems(currentId == 0 ? parentId : currentId).Where(x => keys.Contains(x.Key));
         }
 
         [Obsolete("[v2.0.0]")]