diff --git a/server/AyaNova/DataList/CustomerNoteDataList.cs b/server/AyaNova/DataList/CustomerNoteDataList.cs index 5b55efa0..07f7a165 100644 --- a/server/AyaNova/DataList/CustomerNoteDataList.cs +++ b/server/AyaNova/DataList/CustomerNoteDataList.cs @@ -88,12 +88,8 @@ namespace AyaNova.DataList if (string.IsNullOrWhiteSpace(dataListBase.ClientCriteria)) throw new System.ArgumentNullException("CustomerNoteDataList - ClientCriteria is empty, should be Customer ID"); - DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metacustomer" }; - - DataListColumnFilter ColumnFilter = new DataListColumnFilter(); - ColumnFilter.value = dataListBase.ClientCriteria; - ColumnFilter.op = "="; - FilterOption.items.Add(ColumnFilter); + DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metacustomer" }; + FilterOption.items.Add(new DataListColumnFilter() { value = dataListBase.ClientCriteria, op = DataListFilterComparisonOperator.Equality }); ret.Add(FilterOption); return ret; diff --git a/server/AyaNova/DataList/InsideUserDataList.cs b/server/AyaNova/DataList/InsideUserDataList.cs index 62026d8a..1ce5fd41 100644 --- a/server/AyaNova/DataList/InsideUserDataList.cs +++ b/server/AyaNova/DataList/InsideUserDataList.cs @@ -1,8 +1,10 @@ using System.Collections.Generic; using AyaNova.Biz; +using AyaNova.Models; + namespace AyaNova.DataList { - internal class InsideUserDataList : AyaDataList + internal class InsideUserDataList : AyaDataList, IAyaDataListServerCriteria { public InsideUserDataList() @@ -111,8 +113,18 @@ namespace AyaNova.DataList SqlIdColumnName = "avendor.id", SqlValueColumnName = "avendor.name" }); + } + public List DataListServerCriteria(long currentUserId, AuthorizationRoles userRoles, DataListBase dataListBase) + { + List ret = new List(); + DataListFilterOption FilterOption = new DataListFilterOption() { Column = "usertype" }; + FilterOption.items.Add(new DataListColumnFilter() { value = ((int)UserType.Customer).ToString(), op = DataListFilterComparisonOperator.NotEqual }); + FilterOption.items.Add(new DataListColumnFilter() { value = ((int)UserType.HeadOffice).ToString(), op = DataListFilterComparisonOperator.NotEqual }); + + ret.Add(FilterOption); + return ret; } }//eoc