From cb50e9733b126e9b8551c3bb41c08b421bfc1ebd Mon Sep 17 00:00:00 2001 From: Dennis Straub Date: Fri, 24 Jan 2020 16:47:59 +0100 Subject: [PATCH 1/3] Fixes #332 --- src/Common/Entity/Resource/Media.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Common/Entity/Resource/Media.js b/src/Common/Entity/Resource/Media.js index fe40396a7..aeb79f903 100644 --- 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': From fa34dc9676e784b82143325a927900bb0f8301c0 Mon Sep 17 00:00:00 2001 From: mrzapp Date: Wed, 18 Mar 2020 11:25:03 +0000 Subject: [PATCH 2/3] Fixes #335 --- docker/docker-compose.yml | 4 ++-- src/Client/Entity/View/Field/ArrayEditor.js | 2 +- src/Client/Entity/View/Field/FieldBase.js | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index b18c18530..7b2b285cf 100644 --- 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/src/Client/Entity/View/Field/ArrayEditor.js b/src/Client/Entity/View/Field/ArrayEditor.js index b68026511..26bbfcf14 100644 --- 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 index 235149326..29d1e5176 100644 --- 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]; From b3a12c95490fcc057b18d0c6f0394dc3db01d146 Mon Sep 17 00:00:00 2001 From: mrzapp Date: Wed, 18 Mar 2020 11:25:28 +0000 Subject: [PATCH 3/3] Version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 910472f0b..c365e57cf 100644 --- 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": {