Merge pull request #633 from Peergos/fix/app-calendar-color-check

make sure calendar color is of type string
Peergos · Oct 28, 2024 · 349bcad · 349bcad
2 parents 229e312 + 2b037e1
commit 349bcad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/mixins/sandbox/index.js b/src/mixins/sandbox/index.js
@@ -50,7 +50,7 @@ module.exports = {
               this.$toast.error(this.translate("SANDBOX.UNSAFE") + ': ' + permission, {timeout:false});
           }
       },
-      isString: function isString(x) { //https://stackoverflow.com/a/9436948
+      isString: function(x) { //https://stackoverflow.com/a/9436948
         return typeof x === 'string' || x instanceof String;
       },
       verifyJSONFile: function(file, appPath) {

diff --git a/src/views/Calendar.vue b/src/views/Calendar.vue
@@ -495,8 +495,14 @@ module.exports = {
         };
         this.showPrompt =  true;
     },
+    isString: function(x) {
+        return typeof x === 'string' || x instanceof String;
+    },
     calendarColorChangeRequest: function(calendar, calendarName, newColor) {
         let that = this;
+        if (!this.isString(newColor)) {
+            return;
+        }
         for (var i=0;i < that.calendarProperties.calendars.length; i++) {
             let calendar = that.calendarProperties.calendars[i];
             if (calendar.name == calendarName) {