server/AyaNova/DataList/CustomerNoteDataList.cs

@@ -4,7 +4,7 @@ using AyaNova.Models;
 
 namespace AyaNova.DataList
 {
-    internal class CustomerNoteDataList : AyaDataList, IAyaDataListServerCriteria
+    internal class CustomerNoteDataList : DataListBase, IDataListInternalCriteria
     {
         public CustomerNoteDataList()
         {
@@ -37,9 +37,9 @@ namespace AyaNova.DataList
 
 
             //NOTE: Due to the join, all the sql id and name fields that can conflict with the joined table need to be specified completely
-            FieldDefinitions = new List<AyaDataListFieldDefinition>();
+            FieldDefinitions = new List<DataListFieldDefinition>();
 
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            FieldDefinitions.Add(new DataListFieldDefinition
             {
                 TKey = "User",
                 FieldKey = "username",
@@ -51,7 +51,7 @@ namespace AyaNova.DataList
             });
 
 
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            FieldDefinitions.Add(new DataListFieldDefinition
             {
                 TKey = "CustomerNoteNotes",
                 FieldKey = "notes",
@@ -62,7 +62,7 @@ namespace AyaNova.DataList
                 IsRowId = true
             });
 
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            FieldDefinitions.Add(new DataListFieldDefinition
             {
                 TKey = "CustomerNoteNoteDate",
                 FieldKey = "notedate",
@@ -71,7 +71,7 @@ namespace AyaNova.DataList
             });
 
             //META column 
-            FieldDefinitions.Add(new AyaDataListFieldDefinition
+            FieldDefinitions.Add(new DataListFieldDefinition
             {
                 FieldKey = "metacustomer",
                 UiFieldDataType = (int)UiFieldDataType.InternalId,
@@ -82,7 +82,7 @@ namespace AyaNova.DataList
         }
 
 
-        public List<DataListFilterOption> DataListServerCriteria(long currentUserId, AuthorizationRoles userRoles, DataListBase dataListBase)
+        public List<DataListFilterOption> DataListInternalCriteria(long currentUserId, AuthorizationRoles userRoles, Models.DataListBase dataListBase)
         {
             List<DataListFilterOption> ret = new List<DataListFilterOption>();
             //ClientCriteria MUST be CustomerId