From aa0c73d415f5116d23bd88226171962dd827f7a5 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 11 Feb 2020 21:57:31 +0000
Subject: [PATCH]

---
 server/AyaNova/Controllers/EnumPickListController.cs | 8 ++++----
 server/AyaNova/DataList/TestWidgetDataList.cs        | 2 +-
 server/AyaNova/DataList/UserDataList.cs              | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/AyaNova/Controllers/EnumPickListController.cs b/server/AyaNova/Controllers/EnumPickListController.cs
index 82bd18f8..9acd98cb 100644
--- a/server/AyaNova/Controllers/EnumPickListController.cs
+++ b/server/AyaNova/Controllers/EnumPickListController.cs
@@ -178,10 +178,10 @@ namespace AyaNova.Api.Controllers
             }
 
             List<KeyValuePair<string, string>> ret = new List<KeyValuePair<string, string>>();
-            ret.Add(new KeyValuePair<string, string>(typeof(UserType).ToString(), "AyaNova user account types"));
-            ret.Add(new KeyValuePair<string, string>(typeof(AuthorizationRoles).ToString(), "AyaNova user account role types"));
-            ret.Add(new KeyValuePair<string, string>(typeof(AyaType).ToString(), "All AyaNova object types"));
-            ret.Add(new KeyValuePair<string, string>(typeof(UiFieldDataType).ToString(), "Types of data used in AyaNova for display and formatting UI purposes"));
+            ret.Add(new KeyValuePair<string, string>(StringUtil.TrimTypeName(typeof(UserType).ToString()), "AyaNova user account types"));
+            ret.Add(new KeyValuePair<string, string>(StringUtil.TrimTypeName(typeof(AuthorizationRoles).ToString()), "AyaNova user account role types"));
+            ret.Add(new KeyValuePair<string, string>(StringUtil.TrimTypeName(typeof(AyaType).ToString()), "All AyaNova object types"));
+            ret.Add(new KeyValuePair<string, string>(StringUtil.TrimTypeName(typeof(UiFieldDataType).ToString()), "Types of data used in AyaNova for display and formatting UI purposes"));
 
             return Ok(ApiOkResponse.Response(ret, true));
         }
diff --git a/server/AyaNova/DataList/TestWidgetDataList.cs b/server/AyaNova/DataList/TestWidgetDataList.cs
index 001baa60..ce348c3d 100644
--- a/server/AyaNova/DataList/TestWidgetDataList.cs
+++ b/server/AyaNova/DataList/TestWidgetDataList.cs
@@ -59,7 +59,7 @@ namespace AyaNova.DataList
                 LtKey = "WidgetUserType",
                 FieldKey = "widgetusertype",
                 UiFieldDataType = (int)UiFieldDataType.Enum,
-                EnumType = typeof(UserType).ToString(),
+                EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(UserType).ToString()),
                 SqlValueColumnName = "awidget.usertype"
             });
             FieldDefinitions.Add(new AyaDataListFieldDefinition
diff --git a/server/AyaNova/DataList/UserDataList.cs b/server/AyaNova/DataList/UserDataList.cs
index 8ed02cb3..c4f8b292 100644
--- a/server/AyaNova/DataList/UserDataList.cs
+++ b/server/AyaNova/DataList/UserDataList.cs
@@ -45,7 +45,7 @@ namespace AyaNova.DataList
                 LtKey = "AuthorizationRoles",
                 FieldKey = "userroles",
                 UiFieldDataType = (int)UiFieldDataType.Enum,
-                EnumType = typeof(AuthorizationRoles).ToString(),
+                EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(AuthorizationRoles).ToString()),
                 SqlValueColumnName = "auser.roles"
             });
 
@@ -54,7 +54,7 @@ namespace AyaNova.DataList
                 LtKey = "UserType",
                 FieldKey = "usertype",
                 UiFieldDataType = (int)UiFieldDataType.Enum,
-                EnumType = typeof(UserType).ToString(),
+                EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(UserType).ToString()),
                 SqlValueColumnName = "auser.usertype"
             });