Fix: add check for _backboneForms when checking empty fieldsets (fixes #328) (#329)

Author: taylortom

app/modules/scaffold/index.js

@@ -119,7 +119,7 @@ define([
 
     for (var i in objectSchema) {
       if (!objectSchema.hasOwnProperty(i)) continue;
-      
+
       var objectField = objectSchema[i];
 
       setRequiredValidators(objectField.required, objectField.properties);
@@ -180,7 +180,7 @@ define([
 
   function trimEmptyProperties(object) {
     for (var key in object) {
-      if (!object.hasOwnProperty(key) || object[key].type !== 'object') continue;
+      if (!object.hasOwnProperty(key) || object[key].type !== 'object' || object[key]._backboneForms) continue;
       if (_.isEmpty(object[key].properties)) delete object[key];
     }
   }
@@ -229,11 +229,11 @@ define([
       }
       /*
       * Delete any 'empty' fieldsets:
-      * - No fields specified 
+      * - No fields specified
       * - Only an empty object with no sub-props exists on the schema, so there's nothing to render
       * */
      const noFieldsOnSchema = fields.some(f => {
-      return !schema[f] || (schema[f].type === 'object' && schema[f].properties === undefined);
+      return !schema[f] || (schema[f].type === 'object' && (schema[f].properties === undefined && !schema[f]._backboneForms));
      });
       if(!fields.length || noFieldsOnSchema) delete fieldsets[k];
     });
@@ -339,4 +339,4 @@ define([
   });
 
   Origin.scaffold = Scaffold;
-});
+});