Merge pull request #2519 from adaptlearning/issue/2518

Switch to attribute blacklist

Author: tomgreenfield

frontend/src/core/models/blockModel.js

@@ -10,28 +10,14 @@ define(function(require) {
     // Block specific properties
     layoutOptions:  null,
     dragLayoutOptions: null,
-    // These are the only attributes which should be permitted on a save
-    // TODO look into this...
-    whitelistAttributes: [
-      '_id',
-      '_courseId',
-      '_parentId',
-      '_layoutOptions',
-      '_type',
-      '_sortOrder',
-      '_classes',
-      '_isOptional',
-      '_isAvailable',
-      'body',
-      'displayTitle',
-      'title',
-      '_extensions',
-      'themeSettings',
-      '_onScreen',
-      '_isVisible',
-      '_isHidden',
-      'instruction',
-      '_colorLabel'
+    attributeBlacklist: [
+      '_isDeleted',
+      '_tenantId',
+      '_trackingId',
+      'createdBy',
+      'createdAt',
+      'layoutOptions',
+      'updatedAt'
     ]
   });
 

frontend/src/core/models/componentModel.js

@@ -6,31 +6,11 @@ define(function(require) {
     urlRoot: 'api/content/component',
     _parentType: 'block',
     _siblingTypes: 'component',
-    // These are the only attributes which should be permitted on a save
-    // TODO look into this...
-    whitelistAttributes: [
-      '_id',
-      '_componentType',
-      '_courseId',
-      '_layout',
-      '_parentId',
-      '_type',
-      'properties',
-      '_component',
-      '_extensions',
-      '_classes',
-      '_isOptional',
-      '_isAvailable',
-      'body',
-      'displayTitle',
-      'title',
-      'version',
-      'themeSettings',
-      '_onScreen',
-      '_isVisible',
-      '_isHidden',
-      'instruction',
-      '_colorLabel'
+    attributeBlacklist: [
+      '_isDeleted',
+      'createdBy',
+      'createdAt',
+      'updatedAt'
     ]
   });
 

frontend/src/core/models/contentModel.js

@@ -7,7 +7,7 @@ define(function(require) {
 
   var ContentModel = Backbone.Model.extend({
     idAttribute: '_id',
-    whitelistAttributes: null,
+    attributeBlacklist: null,
 
     initialize: function(options) {
       this.on('sync', this.loadedData, this);
@@ -89,17 +89,13 @@ define(function(require) {
       return JSON.stringify(this);
     },
 
-    // Remove any attributes which are not on the whitelist (called before a save)
     pruneAttributes: function() {
-      var self = this;
-      // Ensure that only valid attributes are pushed back on the save
-      if (self.whitelistAttributes) {
-        _.each(_.keys(self.attributes), function(key) {
-          if (!_.contains(self.whitelistAttributes, key)) {
-            self.unset(key);
-          }
-        });
-      }
+      if (!this.attributeBlacklist) return;
+      Object.keys(this.attributes).forEach(function(key) {
+        if (_.contains(this.attributeBlacklist, key)) {
+          this.unset(key);
+        }
+      }, this);
     }
   });