Merge pull request #147 from xtremespb/core_290721

Bugfixes
xtremespb · Jul 30, 2021 · e0e4983 · e0e4983
2 parents 876aff8 + f629de1
commit e0e4983
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 53 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "zoia3",
-	"version": "3.1.85",
+	"version": "3.1.86",
 	"description": "ZOIA Content Management System",
 	"scripts": {
 		"config": "node ./dev/bin/config.js",

diff --git a/src/shared/marko/components/mform/component.js b/src/shared/marko/components/mform/component.js
@@ -563,6 +563,9 @@ module.exports = class {
         if (field.type === "datepicker") {
             valueProcess = value;
         }
+        if (field.tags) {
+            valueProcess = value && typeof value === "string" ? value.split(",").map(v => v.trim()) : [];
+        }
         return valueProcess;
     }
 

diff --git a/src/shared/marko/components/mform/mField/component.js b/src/shared/marko/components/mform/mField/component.js
@@ -205,15 +205,19 @@ module.exports = class {
     }
 
     updateDatePicker(value) {
-        this.calendarField.func.setDate(value);
-        this.setState("calendarValue", value);
-        const dateObject = typeof value === "string" ? parse(value, "yyyyMMdd", new Date()) : value;
-        this.setState("calendarValueText", format(dateObject, this.i18n.t("global.dateFormatShort")));
-        this.emit("value-change", {
-            type: "datepicker",
-            id: this.state.item.id,
-            value: dateObject,
-        });
+        if (value) {
+            this.calendarField.func.setDate(value);
+            this.setState("calendarValue", value);
+            const dateObject = typeof value === "string" ? parse(value, "yyyyMMdd", new Date()) : value;
+            this.setState("calendarValueText", format(dateObject, this.i18n.t("global.dateFormatShort")));
+            this.emit("value-change", {
+                type: "datepicker",
+                id: this.state.item.id,
+                value: dateObject,
+            });
+        } else {
+            this.setState("calendarValueText", "");
+        }
     }
 
     async onMount() {