From 79aba94e8b10fcd8e73725812124e8bb996d1127 Mon Sep 17 00:00:00 2001
From: mrzapp <contact@jeppezapp.com>
Date: Sun, 11 Jun 2017 08:37:53 +0200
Subject: [PATCH] Fixed project creating bug

---
 package.json                        | 2 +-
 public/js/client.js                 | 2 ++
 public/js/dashboard.js              | 3 +++
 src/common/models/Project.js        | 1 +
 src/server/helpers/ProjectHelper.js | 5 ++---
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index b6622a6ba..05520adb2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "hashbrown-cms",
   "repository": "https://github.com/Putaitu/hashbrown-cms.git",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "The pluggable CMS",
   "main": "hashbrown.js",
   "scripts": {
diff --git a/public/js/client.js b/public/js/client.js
index cdf071ce7..40a26c2d9 100644
--- a/public/js/client.js
+++ b/public/js/client.js
@@ -2352,6 +2352,8 @@
 	            _this.element = _this.$element[0];
 	        }
 
+	        _this.element.innerHTML = '';
+
 	        _this.element.style.position = 'absolute';
 	        _this.element.style.zIndex = 1200;
 	        _this.element.style.top = _this.pos.y;
diff --git a/public/js/dashboard.js b/public/js/dashboard.js
index 1bd796281..0852cf6a4 100644
--- a/public/js/dashboard.js
+++ b/public/js/dashboard.js
@@ -2332,6 +2332,8 @@
 	            _this.element = _this.$element[0];
 	        }
 
+	        _this.element.innerHTML = '';
+
 	        _this.element.style.position = 'absolute';
 	        _this.element.style.zIndex = 1200;
 	        _this.element.style.top = _this.pos.y;
@@ -22134,6 +22136,7 @@
 
 	            project.id = id;
 
+	            project.settings.usedBy = 'project';
 	            project.settings.info = {
 	                name: name
 	            };
diff --git a/src/common/models/Project.js b/src/common/models/Project.js
index 8434fd877..45a180b85 100644
--- a/src/common/models/Project.js
+++ b/src/common/models/Project.js
@@ -23,6 +23,7 @@ class Project extends Entity {
         
         project.id = id;
 
+        project.settings.usedBy = 'project';
         project.settings.info = {
             name: name
         };
diff --git a/src/server/helpers/ProjectHelper.js b/src/server/helpers/ProjectHelper.js
index ac3e647dd..12c250348 100644
--- a/src/server/helpers/ProjectHelper.js
+++ b/src/server/helpers/ProjectHelper.js
@@ -117,7 +117,7 @@ class ProjectHelper {
                 let names = [];
 
                 for(let setting of allSettings) {
-                    if(setting.usedBy === 'project') { continue; }
+                    if(!setting.usedBy || setting.usedBy === 'project') { continue; }
 
                     names.push(setting.usedBy);
                 }
@@ -164,7 +164,6 @@ class ProjectHelper {
             project,
             'settings',
             { usedBy: environment },
-            { usedBy: environment },
             { upsert: true }
         );
     }
@@ -233,7 +232,7 @@ class ProjectHelper {
             if(name && userId) {
                 let project = Project.create(name);
 
-                MongoHelper.insertOne(project.id, 'settings', project.settings.info)
+                MongoHelper.insertOne(project.id, 'settings', project.settings)
                 .then(() => {
                     // The user that creates a project gets all scopes
                     return UserHelper.addUserProjectScope(userId, project.id, [ 'users', 'settings', 'connections', 'schemas' ]);