Version bumped to v0.8.0

HashBrownCMS · May 25, 2017 · 64d0e21 · 64d0e21
1 parent bd6c775
commit 64d0e21
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 113 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": "0.7.2",
+  "version": "0.8.0",
   "description": "The pluggable CMS",
   "main": "hashbrown.js",
   "scripts": {

diff --git a/public/js/client.js b/public/js/client.js
@@ -36577,32 +36577,6 @@
 	            });
 	        }
 
-	        /**
-	         * Sanity check for site settings Schema
-	         *
-	         * @param {Object} schema
-	         *
-	         * @returns {Object} Checked Schema
-	         */
-
-	    }, {
-	        key: 'checkSiteSettings',
-	        value: function checkSiteSettings(schema) {
-	            schema = schema || {};
-
-	            schema.icon = 'wrench';
-	            schema.id = 'siteSettings';
-	            schema.name = 'Site settings';
-	            schema.parentSchemaId = 'contentBase';
-	            schema.hiddenProperties = ['allowedChildSchemas', 'parentSchemaId', 'name', 'icon'];
-
-	            if (schema instanceof ContentSchema === false) {
-	                schema = new ContentSchema(schema);
-	            }
-
-	            return schema;
-	        }
-
 	        /**
 	         * Gets the appropriate model
 	         *
@@ -36687,7 +36661,7 @@
 	module.exports = {
 		"name": "hashbrown-cms",
 		"repository": "https://github.com/Putaitu/hashbrown-cms.git",
-		"version": "0.7.2",
+		"version": "0.8.0",
 		"description": "The pluggable CMS",
 		"main": "hashbrown.js",
 		"scripts": {

diff --git a/public/js/dashboard.js b/public/js/dashboard.js
@@ -20991,7 +20991,7 @@
 	module.exports = {
 		"name": "hashbrown-cms",
 		"repository": "https://github.com/Putaitu/hashbrown-cms.git",
-		"version": "0.7.2",
+		"version": "0.8.0",
 		"description": "The pluggable CMS",
 		"main": "hashbrown.js",
 		"scripts": {

diff --git a/src/common/helpers/SchemaHelper.js b/src/common/helpers/SchemaHelper.js
@@ -21,34 +21,6 @@ class SchemaHelper {
         });
     }
 
-    /**
-     * Sanity check for site settings Schema
-     *
-     * @param {Object} schema
-     *
-     * @returns {Object} Checked Schema
-     */
-    static checkSiteSettings(schema) {
-        schema = schema || {};
-
-        schema.icon = 'wrench';
-        schema.id = 'siteSettings'
-        schema.name = 'Site settings';
-        schema.parentSchemaId = 'contentBase';
-        schema.hiddenProperties = [
-            'allowedChildSchemas',
-            'parentSchemaId',
-            'name',
-            'icon'
-        ];
-
-        if(schema instanceof ContentSchema === false) {
-            schema = new ContentSchema(schema);
-        }
-
-        return schema;
-    }
-
     /**
      * Gets the appropriate model
      *

diff --git a/src/server/helpers/SchemaHelper.js b/src/server/helpers/SchemaHelper.js
@@ -132,12 +132,6 @@ class SchemaHelper extends SchemaHelperCommon {
             }
 
             return SyncHelper.mergeResource(project, environment, 'schemas', schemas, { customOnly: true });
-        })
-        .then((schemas) => {
-            // Last sanity check for site settings
-            schemas.siteSettings = SchemaHelper.checkSiteSettings(schemas.siteSettings || {});
-
-            return Promise.resolve(schemas);
         });
     }
 
@@ -244,45 +238,6 @@ class SchemaHelper extends SchemaHelperCommon {
         });
     }
 
-    /**
-     * Gets the site settings Schema
-     *
-     * @param {String} project
-     * @param {String} environment
-     *
-     * @return {Promise} ContentSchema
-     */
-    static getSiteSettingsSchema(
-        project = requiredParam('project'),
-        environment = requiredParam('environment')
-    ) {
-        let collection = environment + '.schemas';
-
-        // First attempt to find site settings in the database
-        return MongoHelper.findOne(
-            project,
-            collection,
-            {
-                id: 'siteSettings'
-            }
-        ).then((schemaData) => {
-            // If that fails, try to find it using the synced remote
-            if(!schemaData || Object.keys(schemaData).length < 1) {
-                return SyncHelper.getResourceItem(project, environment, 'schemas', 'siteSettings');
-            }
-
-            // If successful, resolve with Schema data
-            return Promise.resolve(schemaData);
-        })
-        .catch(() => {
-            // If site settings were not found on synced instance, never mind
-            return Promise.resolve();
-        })
-        .then((schemaData) => {
-            return Promise.resolve(SchemaHelper.checkSiteSettings(schemaData));
-        });
-    }
-
     /**
      * Gets a Schema by id
      *
@@ -297,11 +252,6 @@ class SchemaHelper extends SchemaHelperCommon {
         environment = requiredParam('environment'),
         id = requiredParam('id')
     ) {
-        // Special case for the "siteSettings" id
-        if(id === 'siteSettings') {
-            return SchemaHelper.getSiteSettingsSchema(project, environment);
-        }
-
         let collection = environment + '.schemas';
 
         if(id) {
@@ -535,12 +485,6 @@ class SchemaHelper extends SchemaHelperCommon {
 
         schema = schema || {};
 
-        // Special case for site settings schema
-        if(id === 'siteSettings') {
-            schema = SchemaHelper.checkSiteSettings(schema).getObject();
-            create = true;
-        }
-
         // Unset automatic flags
         schema.locked = false;
         schema.remote = false;