From 932255d0d111058ca8f875be2b50be1031808386 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 23 Jan 2020 20:44:02 +0000 Subject: [PATCH] --- server/AyaNova/DataList/AyaDataList.cs | 4 ++-- server/AyaNova/DataList/IAyaDataList.cs | 2 +- server/AyaNova/Startup.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/AyaNova/DataList/AyaDataList.cs b/server/AyaNova/DataList/AyaDataList.cs index 0e93504f..d264a40f 100644 --- a/server/AyaNova/DataList/AyaDataList.cs +++ b/server/AyaNova/DataList/AyaDataList.cs @@ -32,7 +32,7 @@ namespace AyaNova.DataList return JArray.Parse($"[ {{\"cm\":\"df\",\"dt\":0,\"ay\":{(int)DefaultListObjectType}}},{{\"cm\":\"Widget\",\"dt\":{(int)AyaUiFieldDataType.Text},\"ay\":{(int)DefaultListObjectType}}}]"); } - public string GenerateListColumnsJSONFromTemplate(string template) + public object GenerateListColumnsJSONFromTemplate(string template) { //parse the template var jtemplate = JObject.Parse(template); @@ -77,7 +77,7 @@ namespace AyaNova.DataList } sb.Append("]"); - return sb.ToString(); + return JArray.Parse(sb.ToString()); } //make sure the template parses and all the fields specified are really existant diff --git a/server/AyaNova/DataList/IAyaDataList.cs b/server/AyaNova/DataList/IAyaDataList.cs index 0591ab15..069717a7 100644 --- a/server/AyaNova/DataList/IAyaDataList.cs +++ b/server/AyaNova/DataList/IAyaDataList.cs @@ -29,7 +29,7 @@ namespace AyaNova.DataList string DefaultDataListDisplayTemplate { get; set; } object GenerateMINIListColumnsJSON(); - string GenerateListColumnsJSONFromTemplate(string template); + object GenerateListColumnsJSONFromTemplate(string template); bool ValidateTemplate(string template); diff --git a/server/AyaNova/Startup.cs b/server/AyaNova/Startup.cs index ad074898..3370a429 100644 --- a/server/AyaNova/Startup.cs +++ b/server/AyaNova/Startup.cs @@ -408,7 +408,7 @@ namespace AyaNova // ******************** TESTING WIPE DB ***************************** // //Set this to true to wipe the db and reinstall a trial license and re-seed the data - var TESTING_REFRESH_DB = true;//####################################################################################### + var TESTING_REFRESH_DB = false;//####################################################################################### #if (DEBUG)