diff --git a/server/AyaNova/DataList/CustomerNoteDataList.cs b/server/AyaNova/DataList/CustomerNoteDataList.cs index e7fb98e8..c9eb62c8 100644 --- a/server/AyaNova/DataList/CustomerNoteDataList.cs +++ b/server/AyaNova/DataList/CustomerNoteDataList.cs @@ -74,6 +74,7 @@ namespace AyaNova.DataList FieldDefinitions.Add(new AyaDataListFieldDefinition { FieldKey = "metacustomer", + UiFieldDataType = (int)UiFieldDataType.InternalId, SqlIdColumnName = "acustomernote.customerid", SqlValueColumnName = "acustomernote.customerid", IsMeta = true diff --git a/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs b/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs index af153374..3fd7d549 100644 --- a/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs +++ b/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs @@ -134,7 +134,8 @@ namespace AyaNova.DataList // columnNameToFilter = DataListField.GetSqlValueColumnName(); // } - //replaced above with simplified block here + //replaced above code that guessed if it was an ID column and instead I explicitly mark the id colunmns + //in the DataList definition with UiFieldDataType.InternalId string columnNameToFilter = string.Empty; UiFieldDataType DataTypeToFilter = UiFieldDataType.NoType; DataTypeToFilter = (UiFieldDataType)dataType; diff --git a/server/AyaNova/DataList/MemoDataList.cs b/server/AyaNova/DataList/MemoDataList.cs index 6d9b0b15..a4de097c 100644 --- a/server/AyaNova/DataList/MemoDataList.cs +++ b/server/AyaNova/DataList/MemoDataList.cs @@ -111,6 +111,7 @@ namespace AyaNova.DataList FieldDefinitions.Add(new AyaDataListFieldDefinition { FieldKey = "metamemoto", + UiFieldDataType = (int)UiFieldDataType.InternalId, SqlIdColumnName = "amemo.toid", SqlValueColumnName = "amemo.toid", IsMeta = true diff --git a/server/AyaNova/DataList/OutsideUserDataList.cs b/server/AyaNova/DataList/OutsideUserDataList.cs index f6a37bd9..e9da2b69 100644 --- a/server/AyaNova/DataList/OutsideUserDataList.cs +++ b/server/AyaNova/DataList/OutsideUserDataList.cs @@ -125,6 +125,7 @@ namespace AyaNova.DataList List ret = new List(); DataListFilterOption FilterOption = new DataListFilterOption() { Column = "usertype" }; + FilterOption.Any=true; FilterOption.Items.Add(new DataListColumnFilter() { value = ((int)UserType.Customer).ToString(), op = DataListFilterComparisonOperator.Equality }); FilterOption.Items.Add(new DataListColumnFilter() { value = ((int)UserType.HeadOffice).ToString(), op = DataListFilterComparisonOperator.Equality }); diff --git a/server/AyaNova/DataList/ReminderDataList.cs b/server/AyaNova/DataList/ReminderDataList.cs index ab2734be..15c15fd3 100644 --- a/server/AyaNova/DataList/ReminderDataList.cs +++ b/server/AyaNova/DataList/ReminderDataList.cs @@ -91,6 +91,7 @@ namespace AyaNova.DataList FieldDefinitions.Add(new AyaDataListFieldDefinition { FieldKey = "metareminderuser", + UiFieldDataType = (int)UiFieldDataType.InternalId, SqlIdColumnName = "areminder.userid", SqlValueColumnName = "areminder.userid", IsMeta = true diff --git a/server/AyaNova/DataList/ReviewDataList.cs b/server/AyaNova/DataList/ReviewDataList.cs index 91a52305..2448c42e 100644 --- a/server/AyaNova/DataList/ReviewDataList.cs +++ b/server/AyaNova/DataList/ReviewDataList.cs @@ -153,6 +153,7 @@ namespace AyaNova.DataList FieldDefinitions.Add(new AyaDataListFieldDefinition { FieldKey = "metareviewuser", + UiFieldDataType = (int)UiFieldDataType.InternalId, SqlIdColumnName = "areview.userid", SqlValueColumnName = "areview.userid", IsMeta = true @@ -162,6 +163,7 @@ namespace AyaNova.DataList FieldDefinitions.Add(new AyaDataListFieldDefinition { FieldKey = "metareviewobjectid", + UiFieldDataType = (int)UiFieldDataType.InternalId, SqlIdColumnName = "areview.objectid", SqlValueColumnName = "areview.objectid", IsMeta = true diff --git a/server/AyaNova/DataList/ServiceBankDataList.cs b/server/AyaNova/DataList/ServiceBankDataList.cs index b902b9aa..ddddba54 100644 --- a/server/AyaNova/DataList/ServiceBankDataList.cs +++ b/server/AyaNova/DataList/ServiceBankDataList.cs @@ -169,7 +169,8 @@ namespace AyaNova.DataList //META object id column FieldDefinitions.Add(new AyaDataListFieldDefinition { - FieldKey = "metaservicebankobjectid", + FieldKey = "metaservicebankobjectid", + UiFieldDataType = (int)UiFieldDataType.InternalId, SqlIdColumnName = "aservicebank.objectid", SqlValueColumnName = "aservicebank.objectid", IsMeta = true