From 8e69f263c79476742b6c4f699a212706e6d0a00c Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 23 Jan 2020 20:39:35 +0000 Subject: [PATCH] --- server/AyaNova/ControllerHelpers/ApiPagedResponse.cs | 4 ++-- server/AyaNova/DataList/AyaDataList.cs | 2 +- server/AyaNova/DataList/DataListFetcher.cs | 2 +- server/AyaNova/DataList/IAyaDataList.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/AyaNova/ControllerHelpers/ApiPagedResponse.cs b/server/AyaNova/ControllerHelpers/ApiPagedResponse.cs index 3e5da525..3e98f2e9 100644 --- a/server/AyaNova/ControllerHelpers/ApiPagedResponse.cs +++ b/server/AyaNova/ControllerHelpers/ApiPagedResponse.cs @@ -27,9 +27,9 @@ namespace AyaNova.Api.ControllerHelpers public object items { get; } public object PageLinks { get; } - public string Columns { get; } + public object Columns { get; } - public ApiPagedResponse(object returnItems, object pageLinks, string columns) + public ApiPagedResponse(object returnItems, object pageLinks, object columns) { items = returnItems; PageLinks = pageLinks; diff --git a/server/AyaNova/DataList/AyaDataList.cs b/server/AyaNova/DataList/AyaDataList.cs index 0d2c4a79..372ba505 100644 --- a/server/AyaNova/DataList/AyaDataList.cs +++ b/server/AyaNova/DataList/AyaDataList.cs @@ -26,7 +26,7 @@ namespace AyaNova.DataList public string ListKey { get; set; } public string DefaultDataListDisplayTemplate { get; set; } - public string GenerateMINIListColumnsJSON() + public object GenerateMINIListColumnsJSON() { return $"[ {{\"cm\":\"df\",\"dt\":0,\"ay\":{(int)DefaultListObjectType}}},{{\"cm\":\"Widget\",\"dt\":{(int)AyaUiFieldDataType.Text},\"ay\":{(int)DefaultListObjectType}}}]"; } diff --git a/server/AyaNova/DataList/DataListFetcher.cs b/server/AyaNova/DataList/DataListFetcher.cs index 92417386..69a3d832 100644 --- a/server/AyaNova/DataList/DataListFetcher.cs +++ b/server/AyaNova/DataList/DataListFetcher.cs @@ -181,7 +181,7 @@ namespace AyaNova.DataList var pageLinks = new PaginationLinkBuilder(Url, routeName, null, listOptions, totalRecordCount).PagingLinksObject(); //BUILD THE COLUMNS RETURN PROPERTY JSON FRAGMENT - string ColumnsJSON = string.Empty; + object ColumnsJSON = string.Empty; if (listOptions.Mini) { ColumnsJSON = DataList.GenerateMINIListColumnsJSON(); diff --git a/server/AyaNova/DataList/IAyaDataList.cs b/server/AyaNova/DataList/IAyaDataList.cs index e1e02250..0591ab15 100644 --- a/server/AyaNova/DataList/IAyaDataList.cs +++ b/server/AyaNova/DataList/IAyaDataList.cs @@ -28,7 +28,7 @@ namespace AyaNova.DataList //Default list display template if none found in db or is invalid, this ensures the data will flow even if people fuck up the templates somehow string DefaultDataListDisplayTemplate { get; set; } - string GenerateMINIListColumnsJSON(); + object GenerateMINIListColumnsJSON(); string GenerateListColumnsJSONFromTemplate(string template); bool ValidateTemplate(string template);