From a4e68c9d60d0ce00419bb38087a6f81bb7ed9979 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 13 Jan 2020 23:59:38 +0000
Subject: [PATCH]

---
 server/AyaNova/biz/ObjectFields.cs | 10 +++++-----
 server/AyaNova/biz/UserBiz.cs      |  2 +-
 server/AyaNova/biz/WidgetBiz.cs    |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/AyaNova/biz/ObjectFields.cs b/server/AyaNova/biz/ObjectFields.cs
index 8115b0be..81f8ed31 100644
--- a/server/AyaNova/biz/ObjectFields.cs
+++ b/server/AyaNova/biz/ObjectFields.cs
@@ -11,8 +11,8 @@ namespace AyaNova.Biz
     public static class ObjectFields
     {
 
-        public const string WIDGET_FORM_KEY = "widget";
-        public const string USER_FORM_KEY = "user";
+        public const string WIDGET_KEY = "widget";
+        public const string USER_KEY = "user";
 
 
         public static List<string> AvailableObjectKeys
@@ -20,7 +20,7 @@ namespace AyaNova.Biz
             get
             {
                 List<string> l = new List<string>{
-                    WIDGET_FORM_KEY, USER_FORM_KEY
+                    WIDGET_KEY, USER_KEY
                 };
                 return l;
             }
@@ -40,7 +40,7 @@ namespace AyaNova.Biz
             List<ObjectField> l = new List<ObjectField>();
             switch (key)
             {
-                case WIDGET_FORM_KEY:
+                case WIDGET_KEY:
                     l.Add(new ObjectField("WidgetName", "Name", false, false));//is not shared localized text key and not hideable as it is in the validation rules for widget
                     l.Add(new ObjectField("WidgetSerial", "Serial"));//not in validation rules BUT, is HIDEABLE and is set to NOT NULLABLE in the schema so this field MUST MUST have a default value in client
                     l.Add(new ObjectField("WidgetDollarAmount", "DollarAmount"));
@@ -69,7 +69,7 @@ namespace AyaNova.Biz
                     l.Add(new ObjectField("WidgetCustom16", false, true, true));
                     break;
 
-                case USER_FORM_KEY:
+                case USER_KEY:
                     l.Add(new ObjectField("Name", true, false));//is  not shared localized text key and not hideable as it is in the validation rules for widget
                     l.Add(new ObjectField("EmployeeNumber"));
                     l.Add(new ObjectField("Roles", false, false));
diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs
index af780f4a..01c3b484 100644
--- a/server/AyaNova/biz/UserBiz.cs
+++ b/server/AyaNova/biz/UserBiz.cs
@@ -531,7 +531,7 @@ namespace AyaNova.Biz
                 AddError(ApiErrorCode.VALIDATION_LENGTH_EXCEEDED, "EmployeeNumber", "255 max");
 
             //Any form customizations to validate?
-            var FormCustomization = ct.FormCustom.SingleOrDefault(x => x.FormKey == ObjectFields.USER_FORM_KEY);
+            var FormCustomization = ct.FormCustom.SingleOrDefault(x => x.FormKey == ObjectFields.USER_KEY);
             if (FormCustomization != null)
             {
                 //Yeppers, do the validation, there are two, the custom fields and the regular fields that might be set to required
diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs
index b9166b8e..b36cae54 100644
--- a/server/AyaNova/biz/WidgetBiz.cs
+++ b/server/AyaNova/biz/WidgetBiz.cs
@@ -495,7 +495,7 @@ namespace AyaNova.Biz
             }
 
             //Any form customizations to validate?
-            var FormCustomization = ct.FormCustom.SingleOrDefault(x => x.FormKey == ObjectFields.WIDGET_FORM_KEY);
+            var FormCustomization = ct.FormCustom.SingleOrDefault(x => x.FormKey == ObjectFields.WIDGET_KEY);
             if (FormCustomization != null)
             {
                 //Yeppers, do the validation, there are two, the custom fields and the regular fields that might be set to required