Merge branch 'develop' into stable

HashBrownCMS · Mar 18, 2020 · f45f69a · f45f69a
2 parents f181fa3 + b3a12c9
commit f45f69a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -6,7 +6,7 @@ networks:
 services:
     node:
         image: node
-        container_name: "hashbrown-cms--node"
+        container_name: "4002-hashbrown-cms--node"
         ports:
             - "${NODE_PORT:-8080}:${NODE_PORT:-8080}"
         depends_on:
@@ -24,7 +24,7 @@ services:
 
     mongodb:
         image: mongo
-        container_name: "hashbrown-cms--mongodb"
+        container_name: "4002-hashbrown-cms--mongodb"
         networks:
             - hashbrown-cms--network
         restart: unless-stopped

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "hashbrown-cms",
   "repository": "https://github.com/HashBrownCMS/hashbrown-cms.git",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "description": "A free and open-source headless CMS",
   "main": "hashbrown.js",
   "scripts": {

diff --git a/src/Client/Entity/View/Field/ArrayEditor.js b/src/Client/Entity/View/Field/ArrayEditor.js
@@ -96,7 +96,7 @@ class ArrayEditor extends HashBrown.Entity.View.Field.FieldBase {
                     item.value = newValue;
                     this.state.value[i] = item;
 
-                    this.trigger('change', this.state.value);
+                    this.onChange(this.state.value);
                 });
 
                 this.state.fields.push({

diff --git a/src/Client/Entity/View/Field/FieldBase.js b/src/Client/Entity/View/Field/FieldBase.js
@@ -106,7 +106,11 @@ class FieldBase extends HashBrown.Entity.View.ViewBase {
         // Multilingual sanity check
         if(this.model.isMultilingual) {
             if(!this.model.value || this.model.value.constructor !== Object) {
+                let rawValue = this.model.value;
+
                 this.model.value = {};
+                this.model.value[HashBrown.Context.language] = rawValue;
+                this.model.value['_multilingual'] = true;
             }
 
             this.state.value = this.model.value[HashBrown.Context.language];

diff --git a/src/Common/Entity/Resource/Media.js b/src/Common/Entity/Resource/Media.js
@@ -64,6 +64,8 @@ class Media extends HashBrown.Entity.Resource.ResourceBase {
             // Image types
             case 'jpg':
                 return 'image/jpeg';
+            case 'jpeg':
+                return 'image/jpeg';
             case 'png':
                 return 'image/png';
             case 'gif':