Merge branch 'master' into stable

HashBrownCMS · Nov 1, 2017 · 338330b · 338330b
2 parents d5edc62 + c18c0ce
commit 338330b
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 14 deletions.
diff --git a/public/js/client.js b/public/js/client.js
@@ -7102,10 +7102,6 @@ var SchemaHelper = function (_SchemaHelperCommon) {
         for (var i in resources.schemas) {
             var schema = resources.schemas[i];
 
-            if (!schema) {
-                console.log(i);
-            }
-
             if (schema.id == id) {
                 if (schema instanceof ContentSchema || schema instanceof FieldSchema) {
                     return schema;

diff --git a/public/js/dashboard.js b/public/js/dashboard.js
@@ -7037,10 +7037,6 @@ var SchemaHelper = function (_SchemaHelperCommon) {
         for (var i in resources.schemas) {
             var schema = resources.schemas[i];
 
-            if (!schema) {
-                console.log(i);
-            }
-
             if (schema.id == id) {
                 if (schema instanceof ContentSchema || schema instanceof FieldSchema) {
                     return schema;

diff --git a/src/Client/Helpers/SchemaHelper.js b/src/Client/Helpers/SchemaHelper.js
@@ -98,8 +98,6 @@ class SchemaHelper extends SchemaHelperCommon {
         for(let i in resources.schemas) {
             let schema = resources.schemas[i];
 
-            if(!schema) { console.log(i); }
-
             if(schema.id == id) {
                 if(schema instanceof ContentSchema || schema instanceof FieldSchema) {
                     return schema;

diff --git a/src/Server/Helpers/ContentHelper.js b/src/Server/Helpers/ContentHelper.js
@@ -170,8 +170,6 @@ class ContentHelper extends ContentHelperCommon {
             // TODO: Check if allowed at root
             if(!content.parentId) { return Promise.resolve(); }
 
-            console.log(this.isSchemaAllowedAsChild);
-
             // Check for allowed Schemas
             return this.isSchemaAllowedAsChild(project, environment, content.parentId, content.schemaId);
         })()

diff --git a/src/Server/Models/Content.js b/src/Server/Models/Content.js
@@ -29,8 +29,6 @@ class Content extends ContentCommon {
         .then((parents) => {
             for(let parentContent of parents) {
                 let settings = parentContent.settings[key] || {};
-
-                console.log(parentContent.id, settings);
 
                 if(settings.applyToChildren) {
                     // Make clone as to avoid interference with inherent values