From 0acdb752c03fc8ad1daecde30d5841b2ff9505c7 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 10 Nov 2021 01:22:48 +0000 Subject: [PATCH] --- server/AyaNova/DataList/AttachmentDataList.cs | 4 ++-- server/AyaNova/DataList/CustomerDataList.cs | 2 +- server/AyaNova/DataList/DataListFactory.cs | 5 ++--- server/AyaNova/DataList/DataListProcessingBase.cs | 2 +- server/AyaNova/DataList/EventDataList.cs | 5 +++-- server/AyaNova/DataList/IDataListProcessing.cs | 2 +- server/AyaNova/DataList/PartInventoryTransactionsDataList.cs | 4 ++-- server/AyaNova/DataList/ReviewDataList.cs | 4 ++-- server/AyaNova/biz/DataListSavedFilterBiz.cs | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/server/AyaNova/DataList/AttachmentDataList.cs b/server/AyaNova/DataList/AttachmentDataList.cs index 59c4c592..793c4c8d 100644 --- a/server/AyaNova/DataList/AttachmentDataList.cs +++ b/server/AyaNova/DataList/AttachmentDataList.cs @@ -4,7 +4,7 @@ namespace AyaNova.DataList { internal class AttachmentDataList : DataListProcessingBase { - public AttachmentDataList() + public AttachmentDataList(long translationId) { DefaultListAType = AyaType.FileAttachment; SQLFrom = "from afileattachment"; @@ -41,7 +41,7 @@ namespace AyaNova.DataList FieldKey = "object", UiFieldDataType = (int)UiFieldDataType.Text, SqlIdColumnName = "afileattachment.AttachToObjectid", - SqlValueColumnName = $"AYGETNAME(afileattachment.AttachToObjectid, afileattachment.attachtoatype,{CurrentUserTranslationId})", + SqlValueColumnName = $"AYGETNAME(afileattachment.AttachToObjectid, afileattachment.attachtoatype,{translationId})", SqlATypeColumnName = "afileattachment.attachtoatype", Translate=true }); diff --git a/server/AyaNova/DataList/CustomerDataList.cs b/server/AyaNova/DataList/CustomerDataList.cs index 4fda89a9..993f68d7 100644 --- a/server/AyaNova/DataList/CustomerDataList.cs +++ b/server/AyaNova/DataList/CustomerDataList.cs @@ -7,7 +7,7 @@ namespace AyaNova.DataList { internal class CustomerDataList : DataListProcessingBase, IDataListInternalCriteria { - public CustomerDataList() + public CustomerDataList(long translationId) { DefaultListAType = AyaType.Customer; SQLFrom = @"FROM ACUSTOMER diff --git a/server/AyaNova/DataList/DataListFactory.cs b/server/AyaNova/DataList/DataListFactory.cs index 726baa69..cfee262d 100644 --- a/server/AyaNova/DataList/DataListFactory.cs +++ b/server/AyaNova/DataList/DataListFactory.cs @@ -12,9 +12,8 @@ namespace AyaNova.DataList internal static IDataListProcessing GetAyaDataList(string ListKey, long translationId) { System.Reflection.Assembly ass = System.Reflection.Assembly.GetEntryAssembly(); - var v= ass.CreateInstance($"AyaNova.DataList.{ListKey}") as IDataListProcessing; - v.CurrentUserTranslationId=translationId; - return v; + return ass.CreateInstance($"AyaNova.DataList.{ListKey}", false, System.Reflection.BindingFlags.Default, null, new object[] { translationId }, null, null) as IDataListProcessing; + } //List all the datalist types available diff --git a/server/AyaNova/DataList/DataListProcessingBase.cs b/server/AyaNova/DataList/DataListProcessingBase.cs index 3d0e5594..f1389acf 100644 --- a/server/AyaNova/DataList/DataListProcessingBase.cs +++ b/server/AyaNova/DataList/DataListProcessingBase.cs @@ -31,7 +31,7 @@ namespace AyaNova.DataList public AuthorizationRoles AllowedRoles { get; set; } public AyaType DefaultListAType { get; set; } //public long CurrentUserId { get; set; } - public long CurrentUserTranslationId { get; set; } + //public long CurrentUserTranslationId { get; set; } public List DefaultColumns { get; set; } public Dictionary DefaultSortBy { get; set; } diff --git a/server/AyaNova/DataList/EventDataList.cs b/server/AyaNova/DataList/EventDataList.cs index aa161312..32209513 100644 --- a/server/AyaNova/DataList/EventDataList.cs +++ b/server/AyaNova/DataList/EventDataList.cs @@ -4,7 +4,7 @@ namespace AyaNova.DataList { internal class EventDataList : DataListProcessingBase { - public EventDataList() + public EventDataList(long translationId) { //NOTE: used this type because it's full BizFull and read only Bizrestricted only which is appropriate and there is no event type DefaultListAType = AyaType.Global; @@ -13,6 +13,7 @@ namespace AyaNova.DataList AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change; DefaultColumns = new List() { "eventcreated", "event", "object", "AyaType", "username", "textra" }; DefaultSortBy = new Dictionary() { { "eventcreated", "-" } }; + FieldDefinitions = new List(); @@ -48,7 +49,7 @@ namespace AyaNova.DataList FieldKey = "object", UiFieldDataType = (int)UiFieldDataType.Text, SqlIdColumnName = "aevent.ayid", - SqlValueColumnName = $"AYGETNAME(aevent.ayid, aevent.ayatype,{CurrentUserTranslationId})", + SqlValueColumnName = $"AYGETNAME(aevent.ayid, aevent.ayatype,{translationId})", SqlATypeColumnName = "aevent.ayatype" }); diff --git a/server/AyaNova/DataList/IDataListProcessing.cs b/server/AyaNova/DataList/IDataListProcessing.cs index 93229d8a..fcd0f170 100644 --- a/server/AyaNova/DataList/IDataListProcessing.cs +++ b/server/AyaNova/DataList/IDataListProcessing.cs @@ -18,6 +18,6 @@ namespace AyaNova.DataList void SetListOptionDefaultsIfNecessary(Models.DataListProcessingBase listOptions); Newtonsoft.Json.Linq.JArray GenerateReturnListColumns(List columns); - long CurrentUserTranslationId { get; set; } + //long CurrentUserTranslationId { get; set; } } } \ No newline at end of file diff --git a/server/AyaNova/DataList/PartInventoryTransactionsDataList.cs b/server/AyaNova/DataList/PartInventoryTransactionsDataList.cs index bc9b7060..63d8e868 100644 --- a/server/AyaNova/DataList/PartInventoryTransactionsDataList.cs +++ b/server/AyaNova/DataList/PartInventoryTransactionsDataList.cs @@ -7,7 +7,7 @@ namespace AyaNova.DataList { internal class PartInventoryTransactionsDataList : DataListProcessingBase, IDataListInternalCriteria { - public PartInventoryTransactionsDataList() + public PartInventoryTransactionsDataList(long translationId) { DefaultListAType = AyaType.PartInventory; SQLFrom = "from apartinventory " @@ -28,7 +28,7 @@ namespace AyaNova.DataList FieldKey = "PartInventoryTransactionSource", UiFieldDataType = (int)UiFieldDataType.Text, SqlIdColumnName = "apartinventory.sourceid", - SqlValueColumnName = $"AYGETNAME(apartinventory.sourceid, apartinventory.sourcetype,{CurrentUserTranslationId})", + SqlValueColumnName = $"AYGETNAME(apartinventory.sourceid, apartinventory.sourcetype,{translationId})", SqlATypeColumnName = "apartinventory.sourcetype", Translate=true }); diff --git a/server/AyaNova/DataList/ReviewDataList.cs b/server/AyaNova/DataList/ReviewDataList.cs index 88e68d01..adcc2391 100644 --- a/server/AyaNova/DataList/ReviewDataList.cs +++ b/server/AyaNova/DataList/ReviewDataList.cs @@ -6,7 +6,7 @@ namespace AyaNova.DataList { internal class ReviewDataList : DataListProcessingBase, IDataListInternalCriteria { - public ReviewDataList() + public ReviewDataList(long translationId) { DefaultListAType = AyaType.Review; @@ -25,7 +25,7 @@ namespace AyaNova.DataList FieldKey = "Object", UiFieldDataType = (int)UiFieldDataType.Text, SqlIdColumnName = "areview.objectid", - SqlValueColumnName = $"AYGETNAME(areview.objectid, areview.aType,{CurrentUserTranslationId})", + SqlValueColumnName = $"AYGETNAME(areview.objectid, areview.aType,{translationId})", SqlATypeColumnName = "areview.aType", Translate=true }); diff --git a/server/AyaNova/biz/DataListSavedFilterBiz.cs b/server/AyaNova/biz/DataListSavedFilterBiz.cs index 26cc1a2b..bd9cc396 100644 --- a/server/AyaNova/biz/DataListSavedFilterBiz.cs +++ b/server/AyaNova/biz/DataListSavedFilterBiz.cs @@ -104,7 +104,7 @@ namespace AyaNova.Biz throw new System.ArgumentOutOfRangeException($"ListKey '{listKey}' is not a valid DataListKey"); } - var dataList = DataListFactory.GetAyaDataList(listKey,0); + //var dataList = DataListFactory.GetAyaDataList(listKey,0); DataListSavedFilter d = new DataListSavedFilter(); d.ListKey = listKey;