Merge branch 'master' into stable

HashBrownCMS · Dec 5, 2017 · 61fedce · 61fedce
2 parents ca0f532 + 110082b
commit 61fedce
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "hashbrown-cms",
   "repository": "https://github.com/Putaitu/hashbrown-cms.git",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "The pluggable CMS",
   "main": "hashbrown.js",
   "scripts": {

diff --git a/public/js/client.js b/public/js/client.js
@@ -41180,7 +41180,7 @@ module.exports = ["address", "article", "aside", "blockquote", "canvas", "dd", "
 module.exports = {
 	"name": "hashbrown-cms",
 	"repository": "https://github.com/Putaitu/hashbrown-cms.git",
-	"version": "1.0.1",
+	"version": "1.0.3",
 	"description": "The pluggable CMS",
 	"main": "hashbrown.js",
 	"scripts": {

diff --git a/public/js/dashboard.js b/public/js/dashboard.js
@@ -36338,7 +36338,7 @@ module.exports = ["address", "article", "aside", "blockquote", "canvas", "dd", "
 module.exports = {
 	"name": "hashbrown-cms",
 	"repository": "https://github.com/Putaitu/hashbrown-cms.git",
-	"version": "1.0.1",
+	"version": "1.0.3",
 	"description": "The pluggable CMS",
 	"main": "hashbrown.js",
 	"scripts": {

diff --git a/src/Server/Controllers/ContentController.js b/src/Server/Controllers/ContentController.js
@@ -198,7 +198,7 @@ class ContentController extends require('./ApiController') {
         .then((resourceItem) => {
             if(!resourceItem) { return Promise.reject(new Error('Couldn\'t find remote Content "' + id + '"')); }
 
-            return HashBrown.Helpers.ContentHelper.setContentById(req.project, req.environment, id, resourceItem, req.user, true)
+            return HashBrown.Helpers.ContentHelper.setContentById(req.project, req.environment, id, new HashBrown.Models.Content(resourceItem), req.user, true)
             .then(() => {
                 res.status(200).send(resourceItem);
             });

diff --git a/src/Server/Controllers/FormsController.js b/src/Server/Controllers/FormsController.js
@@ -104,7 +104,7 @@ class FormsController extends require('./ApiController') {
         .then((resourceItem) => {
             if(!resourceItem) { return Promise.reject(new Error('Couldn\'t find remote Form "' + id + '"')); }
 
-            return HashBrown.Helpers.FormHelper.setForm(req.project, req.environment, id, resourceItem)
+            return HashBrown.Helpers.FormHelper.setForm(req.project, req.environment, id, new HashBrown.Models.Form(resourceItem))
             .then(() => {
                 res.status(200).send(resourceItem);
             });