From 10a784412d9fd8a55aa17969d4ff1d3ecf06caec Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 15 Mar 2021 22:31:42 +0000 Subject: [PATCH] --- .../models/DataListTableProcessingOptions.cs | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/server/AyaNova/models/DataListTableProcessingOptions.cs b/server/AyaNova/models/DataListTableProcessingOptions.cs index 822302cf..3d01a788 100644 --- a/server/AyaNova/models/DataListTableProcessingOptions.cs +++ b/server/AyaNova/models/DataListTableProcessingOptions.cs @@ -71,14 +71,14 @@ namespace AyaNova.Models internal void SetHiddenAffectiveColumns(IDataListProcessing dataList) { - List tempKeys = new List(); + foreach (string s in base.Filter.Select(z => z.Column).ToList()) { if (!Columns.Contains(s)) { - if (!tempKeys.Contains(s)) + if (!HiddenAffectiveColumns.Contains(s)) { - tempKeys.Add(s); + HiddenAffectiveColumns.Add(s); } } } @@ -88,21 +88,12 @@ namespace AyaNova.Models { if (!Columns.Contains(s)) { - if (!tempKeys.Contains(s)) + if (!HiddenAffectiveColumns.Contains(s)) { - tempKeys.Add(s); + HiddenAffectiveColumns.Add(s); } } } - - foreach (string s in tempKeys) - { - var fd = dataList.FieldDefinitions.Where(z => z.FieldKey == s).FirstOrDefault(); - if (fd != null) - HiddenAffectiveColumns.Add(fd.TKey); - } } } - - } \ No newline at end of file