From 16edc83450a75b48489915e4454e72c77f57b928 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 14 Jan 2020 21:57:00 +0000
Subject: [PATCH]

---
 server/AyaNova/biz/ObjectFields.cs | 19 -------------------
 server/AyaNova/biz/UserBiz.cs      |  4 ++--
 server/AyaNova/biz/WidgetBiz.cs    |  2 +-
 server/AyaNova/util/Seeder.cs      |  2 +-
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/server/AyaNova/biz/ObjectFields.cs b/server/AyaNova/biz/ObjectFields.cs
index a1167450..cdf6fb29 100644
--- a/server/AyaNova/biz/ObjectFields.cs
+++ b/server/AyaNova/biz/ObjectFields.cs
@@ -135,7 +135,6 @@ namespace AyaNova.Biz
     {
         public string Key { get; set; }
         public string PropertyName { get; set; }
-        //NOTE: Not hideable fields don't require a PropertyName value because they are already required and will be validated
         public bool Hideable { get; set; }
         public bool SharedLTKey { get; set; }
         public bool Custom { get; set; }
@@ -158,24 +157,6 @@ namespace AyaNova.Biz
             MiniAvailable = true;
         }
 
-        // public ObjectField(string key, string propertyName, bool sharedLTKey = false, bool hideable = true, bool custom = false)
-        // {
-        //     Key = key;
-        //     Hideable = hideable;
-        //     Custom = custom;
-        //     SharedLTKey = sharedLTKey;
-        //     PropertyName = propertyName;//Only if hideable do they require this as non-hideable ones are automatically validated anyway and this is only required for validation
-        // }
-
-        // public ObjectField(string key, bool sharedLTKey = false, bool hideable = true, bool custom = false)
-        // {
-        //     Key = key;
-        //     Hideable = hideable;
-        //     Custom = custom;
-        //     SharedLTKey = sharedLTKey;
-        //     PropertyName = null;
-
-        // }
     }
 
 
diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs
index a4706e9d..2b397800 100644
--- a/server/AyaNova/biz/UserBiz.cs
+++ b/server/AyaNova/biz/UserBiz.cs
@@ -191,7 +191,7 @@ namespace AyaNova.Biz
                 var TheFilter = await ct.DataFilter.FirstOrDefaultAsync(x => x.Id == pagingOptions.DataFilterId);
 
                 //BUILD WHERE AND APPEND IT
-                q = q + FilterSqlCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, ObjectFields.ObjectFieldsList("user"), UserId);
+                q = q + FilterSqlCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, ObjectFields.ObjectFieldsList(ObjectFields.USER_KEY), UserId);
 
                 //BUILD ORDER BY AND APPEND IT
                 q = q + FilterSqlOrderByBuilder.DataFilterToSQLOrderBy(TheFilter);
@@ -252,7 +252,7 @@ namespace AyaNova.Biz
             pagingOptions.Limit = pagingOptions.Limit ?? ListOptions.DefaultLimit;
 
 
-            var ret = PickListFetcher.GetPickList(ct, UserId, pagingOptions, ObjectFields.ObjectFieldsList("user"), "auser");
+            var ret = PickListFetcher.GetPickList(ct, UserId, pagingOptions, ObjectFields.ObjectFieldsList(ObjectFields.USER_KEY), "auser");
 
             var pageLinks = new PaginationLinkBuilder(Url, routeName, null, pagingOptions, ret.TotalRecordCount).PagingLinksObject();
 
diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs
index 45a9125f..c0ff4208 100644
--- a/server/AyaNova/biz/WidgetBiz.cs
+++ b/server/AyaNova/biz/WidgetBiz.cs
@@ -305,7 +305,7 @@ namespace AyaNova.Biz
                 var TheFilter = await ct.DataFilter.FirstOrDefaultAsync(x => x.Id == pagingOptions.DataFilterId);
 
                 //BUILD WHERE AND APPEND IT
-                q = q + FilterSqlCriteriaBuilder.DataFilterToSQLCriteria(TheFilter,  ObjectFields.ObjectFieldsList("widget"), UserId);
+                q = q + FilterSqlCriteriaBuilder.DataFilterToSQLCriteria(TheFilter,  ObjectFields.ObjectFieldsList(ObjectFields.WIDGET_KEY), UserId);
 
                 //BUILD ORDER BY AND APPEND IT
                 q = q + FilterSqlOrderByBuilder.DataFilterToSQLOrderBy(TheFilter);
diff --git a/server/AyaNova/util/Seeder.cs b/server/AyaNova/util/Seeder.cs
index e523e644..b33ff54d 100644
--- a/server/AyaNova/util/Seeder.cs
+++ b/server/AyaNova/util/Seeder.cs
@@ -81,7 +81,7 @@ namespace AyaNova.Util
                 {
                     var fc = new FormCustom()
                     {
-                        FormKey = "widget",
+                        FormKey = ObjectFields.WIDGET_KEY,
                         Template = @"[
                                             {
                                             ""fld"": ""WidgetNotes"",