From 4267b4682d31af4b40dfc289642c0c7c3c065e01 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 23 Jan 2020 20:41:59 +0000 Subject: [PATCH] --- .../AyaNova/ControllerHelpers/ApiOkWithPagingResponse.cs | 2 +- server/AyaNova/DataList/AyaDataList.cs | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server/AyaNova/ControllerHelpers/ApiOkWithPagingResponse.cs b/server/AyaNova/ControllerHelpers/ApiOkWithPagingResponse.cs index 128b45a5..fe80a287 100644 --- a/server/AyaNova/ControllerHelpers/ApiOkWithPagingResponse.cs +++ b/server/AyaNova/ControllerHelpers/ApiOkWithPagingResponse.cs @@ -24,7 +24,7 @@ namespace AyaNova.Api.ControllerHelpers public object Data { get; } public object Paging { get; } - public string Columns {get;} + public object Columns {get;} public ApiOkWithPagingResponse(ApiPagedResponse pr) { diff --git a/server/AyaNova/DataList/AyaDataList.cs b/server/AyaNova/DataList/AyaDataList.cs index 372ba505..0e93504f 100644 --- a/server/AyaNova/DataList/AyaDataList.cs +++ b/server/AyaNova/DataList/AyaDataList.cs @@ -28,7 +28,8 @@ namespace AyaNova.DataList public object GenerateMINIListColumnsJSON() { - return $"[ {{\"cm\":\"df\",\"dt\":0,\"ay\":{(int)DefaultListObjectType}}},{{\"cm\":\"Widget\",\"dt\":{(int)AyaUiFieldDataType.Text},\"ay\":{(int)DefaultListObjectType}}}]"; + //return $"[ {{\"cm\":\"df\",\"dt\":0,\"ay\":{(int)DefaultListObjectType}}},{{\"cm\":\"Widget\",\"dt\":{(int)AyaUiFieldDataType.Text},\"ay\":{(int)DefaultListObjectType}}}]"; + return JArray.Parse($"[ {{\"cm\":\"df\",\"dt\":0,\"ay\":{(int)DefaultListObjectType}}},{{\"cm\":\"Widget\",\"dt\":{(int)AyaUiFieldDataType.Text},\"ay\":{(int)DefaultListObjectType}}}]"); } public string GenerateListColumnsJSONFromTemplate(string template) @@ -92,7 +93,7 @@ namespace AyaNova.DataList foreach (string s in fullFields) { - AyaDataListFieldDefinition o = FieldDefinitions.FirstOrDefault(x => x.FieldKey == s); + AyaDataListFieldDefinition o = FieldDefinitions.FirstOrDefault(x => x.FieldKey == s); if (o == null) { return false; @@ -101,7 +102,7 @@ namespace AyaNova.DataList foreach (string s in miniFields) { - AyaDataListFieldDefinition o = FieldDefinitions.FirstOrDefault(x => x.FieldKey == s); + AyaDataListFieldDefinition o = FieldDefinitions.FirstOrDefault(x => x.FieldKey == s); if (o == null) { return false;