admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-01-23 20:47:22 +00:00
parent 932255d0d1
commit 452dc30484
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/AyaNova/ControllerHelpers/ApiPagedResponse.cs
View File

@@ -27,9 +27,9 @@ namespace AyaNova.Api.ControllerHelpers
public object items { get; } public object items { get; }
public object PageLinks { get; } public object PageLinks { get; }
public object Columns { get; } public Newtonsoft.Json.Linq.JArray Columns { get; }
public ApiPagedResponse(object returnItems, object pageLinks, object columns) public ApiPagedResponse(object returnItems, object pageLinks, Newtonsoft.Json.Linq.JArray columns)
{ {
items = returnItems; items = returnItems;
PageLinks = pageLinks; PageLinks = pageLinks;

4
server/AyaNova/DataList/AyaDataList.cs
View File

@@ -26,13 +26,13 @@ namespace AyaNova.DataList
public string ListKey { get; set; } public string ListKey { get; set; }
public string DefaultDataListDisplayTemplate { get; set; } public string DefaultDataListDisplayTemplate { get; set; }
public object GenerateMINIListColumnsJSON() public Newtonsoft.Json.Linq.JArray 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}}}]"); return JArray.Parse($"[ {{\"cm\":\"df\",\"dt\":0,\"ay\":{(int)DefaultListObjectType}}},{{\"cm\":\"Widget\",\"dt\":{(int)AyaUiFieldDataType.Text},\"ay\":{(int)DefaultListObjectType}}}]");
} }
public object GenerateListColumnsJSONFromTemplate(string template) public Newtonsoft.Json.Linq.JArray GenerateListColumnsJSONFromTemplate(string template)
{ {
//parse the template //parse the template
var jtemplate = JObject.Parse(template); var jtemplate = JObject.Parse(template);

2
server/AyaNova/DataList/DataListFetcher.cs
View File

@@ -181,7 +181,7 @@ namespace AyaNova.DataList
var pageLinks = new PaginationLinkBuilder(Url, routeName, null, listOptions, totalRecordCount).PagingLinksObject(); var pageLinks = new PaginationLinkBuilder(Url, routeName, null, listOptions, totalRecordCount).PagingLinksObject();
//BUILD THE COLUMNS RETURN PROPERTY JSON FRAGMENT //BUILD THE COLUMNS RETURN PROPERTY JSON FRAGMENT
object ColumnsJSON = string.Empty; Newtonsoft.Json.Linq.JArray ColumnsJSON = null;
if (listOptions.Mini) if (listOptions.Mini)
{ {
ColumnsJSON = DataList.GenerateMINIListColumnsJSON(); ColumnsJSON = DataList.GenerateMINIListColumnsJSON();

4
server/AyaNova/DataList/IAyaDataList.cs
View File

@@ -28,8 +28,8 @@ 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 //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 DefaultDataListDisplayTemplate { get; set; }
object GenerateMINIListColumnsJSON(); Newtonsoft.Json.Linq.JArray GenerateMINIListColumnsJSON();
object GenerateListColumnsJSONFromTemplate(string template); Newtonsoft.Json.Linq.JArray GenerateListColumnsJSONFromTemplate(string template);
bool ValidateTemplate(string template); bool ValidateTemplate(string template);