From eef1767b7f7d4d2e8bbd9fea66e56e8b4227af67 Mon Sep 17 00:00:00 2001 From: Kyle Watson Date: Wed, 26 Aug 2020 11:34:28 -0700 Subject: [PATCH] #156 fixed table configuration dialog headers --- .../main/java/com/themecleanflex/models/DatalistModel.java | 6 +++--- fragments/datalist/model.json | 2 +- .../apps/themecleanflex/components/datalist/dialog.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/themecleanflex/models/DatalistModel.java b/core/src/main/java/com/themecleanflex/models/DatalistModel.java index ca1e7258e..4dd42d88a 100644 --- a/core/src/main/java/com/themecleanflex/models/DatalistModel.java +++ b/core/src/main/java/com/themecleanflex/models/DatalistModel.java @@ -39,7 +39,7 @@ "type": "string", "x-source": "inject", "x-form-label": "Table Configuration", - "x-form-fieldLabel": "title", + "x-form-fieldLabel": "header", "x-form-type": "collection", "properties": { "value": { @@ -383,7 +383,7 @@ public class DatalistModel extends AbstractComponent { @Inject private String loadFunction; - /* {"type":"string","x-source":"inject","x-form-label":"Table Configuration","x-form-fieldLabel":"title","x-form-type":"collection","properties":{"value":{"type":"string","x-source":"inject","x-form-label":"Data Value","x-form-type":"text"},"header":{"type":"string","x-source":"inject","x-form-label":"Column Header","x-form-type":"text"}}} */ + /* {"type":"string","x-source":"inject","x-form-label":"Table Configuration","x-form-fieldLabel":"header","x-form-type":"collection","properties":{"value":{"type":"string","x-source":"inject","x-form-label":"Data Value","x-form-type":"text"},"header":{"type":"string","x-source":"inject","x-form-label":"Column Header","x-form-type":"text"}}} */ @Inject private List columns; @@ -522,7 +522,7 @@ public String getLoadFunction() { return loadFunction; } - /* {"type":"string","x-source":"inject","x-form-label":"Table Configuration","x-form-fieldLabel":"title","x-form-type":"collection","properties":{"value":{"type":"string","x-source":"inject","x-form-label":"Data Value","x-form-type":"text"},"header":{"type":"string","x-source":"inject","x-form-label":"Column Header","x-form-type":"text"}}} */ + /* {"type":"string","x-source":"inject","x-form-label":"Table Configuration","x-form-fieldLabel":"header","x-form-type":"collection","properties":{"value":{"type":"string","x-source":"inject","x-form-label":"Data Value","x-form-type":"text"},"header":{"type":"string","x-source":"inject","x-form-label":"Column Header","x-form-type":"text"}}} */ public List getColumns() { return columns; } diff --git a/fragments/datalist/model.json b/fragments/datalist/model.json index 4681ab696..07d35e334 100644 --- a/fragments/datalist/model.json +++ b/fragments/datalist/model.json @@ -22,7 +22,7 @@ "type": "string", "x-source": "inject", "x-form-label": "Table Configuration", - "x-form-fieldLabel": "title", + "x-form-fieldLabel": "header", "x-form-type": "collection", "properties": { diff --git a/ui.apps/src/main/content/jcr_root/apps/themecleanflex/components/datalist/dialog.json b/ui.apps/src/main/content/jcr_root/apps/themecleanflex/components/datalist/dialog.json index b0f38711e..535a1a341 100644 --- a/ui.apps/src/main/content/jcr_root/apps/themecleanflex/components/datalist/dialog.json +++ b/ui.apps/src/main/content/jcr_root/apps/themecleanflex/components/datalist/dialog.json @@ -19,7 +19,7 @@ "type": "collection", "multifield": true, "fieldLabel": [ - "title", + "header", "value" ], "fields": [