#156 reordered dialog option for datalist

headwirecom · Aug 26, 2020 · f86a1bb · f86a1bb
1 parent eef1767
commit f86a1bb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/core/src/main/java/com/themecleanflex/models/DatalistModel.java b/core/src/main/java/com/themecleanflex/models/DatalistModel.java
@@ -42,16 +42,16 @@
           "x-form-fieldLabel": "header",
           "x-form-type": "collection",
           "properties": {
-            "value": {
+            "header": {
               "type": "string",
               "x-source": "inject",
-              "x-form-label": "Data Value",
+              "x-form-label": "Column Header",
               "x-form-type": "text"
             },
-            "header": {
+            "value": {
               "type": "string",
               "x-source": "inject",
-              "x-form-label": "Column Header",
+              "x-form-label": "Data Value",
               "x-form-type": "text"
             }
           }
@@ -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":"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"}}} */
+	/* {"type":"string","x-source":"inject","x-form-label":"Table Configuration","x-form-fieldLabel":"header","x-form-type":"collection","properties":{"header":{"type":"string","x-source":"inject","x-form-label":"Column Header","x-form-type":"text"},"value":{"type":"string","x-source":"inject","x-form-label":"Data Value","x-form-type":"text"}}} */
 	@Inject
 	private List<IComponent> columns;
 
@@ -522,7 +522,7 @@ public String getLoadFunction() {
 		return loadFunction;
 	}
 
-	/* {"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"}}} */
+	/* {"type":"string","x-source":"inject","x-form-label":"Table Configuration","x-form-fieldLabel":"header","x-form-type":"collection","properties":{"header":{"type":"string","x-source":"inject","x-form-label":"Column Header","x-form-type":"text"},"value":{"type":"string","x-source":"inject","x-form-label":"Data Value","x-form-type":"text"}}} */
 	public List<IComponent> getColumns() {
 		return columns;
 	}

diff --git a/fragments/datalist/model.json b/fragments/datalist/model.json
@@ -25,17 +25,16 @@
           "x-form-fieldLabel": "header",
           "x-form-type": "collection",
           "properties": {
-
-            "value": {
+            "header": {
               "type": "string",
               "x-source": "inject",
-              "x-form-label": "Data Value",
+              "x-form-label": "Column Header",
               "x-form-type": "text"
             },
-            "header": {
+            "value": {
               "type": "string",
               "x-source": "inject",
-              "x-form-label": "Column Header",
+              "x-form-label": "Data Value",
               "x-form-type": "text"
             }
           }

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
@@ -26,16 +26,16 @@
         {
           "type": "input",
           "inputType": "text",
-          "placeholder": "value",
-          "label": "Data Value",
-          "model": "value"
+          "placeholder": "header",
+          "label": "Column Header",
+          "model": "header"
         },
         {
           "type": "input",
           "inputType": "text",
-          "placeholder": "header",
-          "label": "Column Header",
-          "model": "header"
+          "placeholder": "value",
+          "label": "Data Value",
+          "model": "value"
         }
       ],
       "placeholder": "columns",