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:41:59 +00:00
parent 8e69f263c7
commit 4267b4682d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/AyaNova/ControllerHelpers/ApiOkWithPagingResponse.cs
View File

@@ -24,7 +24,7 @@ namespace AyaNova.Api.ControllerHelpers
public object Data { get; } public object Data { get; }
public object Paging { get; } public object Paging { get; }
public string Columns {get;} public object Columns {get;}
public ApiOkWithPagingResponse(ApiPagedResponse pr) public ApiOkWithPagingResponse(ApiPagedResponse pr)
{ {

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

@@ -28,7 +28,8 @@ namespace AyaNova.DataList
public object GenerateMINIListColumnsJSON() 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) public string GenerateListColumnsJSONFromTemplate(string template)
@@ -92,7 +93,7 @@ namespace AyaNova.DataList
foreach (string s in fullFields) foreach (string s in fullFields)
{ {
AyaDataListFieldDefinition o = FieldDefinitions.FirstOrDefault(x => x.FieldKey == s); AyaDataListFieldDefinition o = FieldDefinitions.FirstOrDefault(x => x.FieldKey == s);
if (o == null) if (o == null)
{ {
return false; return false;
@@ -101,7 +102,7 @@ namespace AyaNova.DataList
foreach (string s in miniFields) foreach (string s in miniFields)
{ {
AyaDataListFieldDefinition o = FieldDefinitions.FirstOrDefault(x => x.FieldKey == s); AyaDataListFieldDefinition o = FieldDefinitions.FirstOrDefault(x => x.FieldKey == s);
if (o == null) if (o == null)
{ {
return false; return false;