Merge pull request #676 from adaptlearning/issue/#674

Some other fixes to tags not allowing images to save
adaptlearning · May 12, 2015 · e07f2bf · e07f2bf
2 parents df25a8f + 42f87df
commit e07f2bf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/frontend/src/core/project/less/project.less b/frontend/src/core/project/less/project.less
@@ -167,6 +167,12 @@
     }
 }
 
+.project-detail-hide-hero {
+    .field-hero-image {
+        display:none;
+    }
+}
+
 .project-settings-inner {
     padding: 7px 6px;
 

diff --git a/frontend/src/core/project/models/projectModel.js b/frontend/src/core/project/models/projectModel.js
@@ -3,8 +3,9 @@ define(function(require) {
 
   var Backbone = require('backbone');
   var Origin = require('coreJS/app/origin');
+  var EditorModel = require('editorGlobal/models/editorModel');
 
-  var ProjectModel = Backbone.Model.extend({
+  var ProjectModel = EditorModel.extend({
 
     idAttribute: '_id',
 
@@ -15,6 +16,9 @@ define(function(require) {
         _type: 'course'
     },
 
+    initialize : function(options) {
+    },
+
     getHeroImageURI: function () {
       return '/api/asset/serve/' + this.get('heroImage');
     },

diff --git a/frontend/src/core/project/views/projectDetailView.js b/frontend/src/core/project/views/projectDetailView.js
@@ -16,6 +16,7 @@ define(function(require) {
 
       if (this.model.isNew()) {
         this.isNew = true;
+        this.$el.addClass('project-detail-hide-hero');
         // Initialise the 'tags' property for a new course
         this.model.set('tags', []);
       }

diff --git a/frontend/src/core/scaffold/views/scaffoldAssetView.js b/frontend/src/core/scaffold/views/scaffoldAssetView.js
@@ -103,7 +103,7 @@ define(function(require) {
 
         checkValueHasChanged: function() {
             if ('heroImage' === this.key){
-                this.saveModel(true);
+                this.saveModel(false);
                 return;
             }
             var contentTypeId = Origin.scaffold.getCurrentModel().get('_id');
@@ -148,7 +148,7 @@ define(function(require) {
 
                         if ('heroImage' === this.key){
                             this.setValue(data.assetId);
-                            this.saveModel(true);
+                            this.saveModel(false);
                             return;
                         }
                         // Setup courseasset
@@ -274,6 +274,7 @@ define(function(require) {
             if (alternativeAttribute) {
                 attributesToSave[alternativeAttribute] = Origin.scaffold.getCurrentModel().attributes;
             } else {
+                currentModel.unset('tags');
                 attributesToSave = null;
             }