From edf6e3e772ca04b556a9c9d73205113fab501436 Mon Sep 17 00:00:00 2001 From: Daryl Hedley Date: Thu, 16 Apr 2015 14:09:45 +0100 Subject: [PATCH 1/8] With error with updates being called when they should create new documents --- .../core/scaffold/views/scaffoldAssetView.js | 68 +++++++------------ 1 file changed, 23 insertions(+), 45 deletions(-) diff --git a/frontend/src/core/scaffold/views/scaffoldAssetView.js b/frontend/src/core/scaffold/views/scaffoldAssetView.js index 1842c6355d..7e02d9716a 100644 --- a/frontend/src/core/scaffold/views/scaffoldAssetView.js +++ b/frontend/src/core/scaffold/views/scaffoldAssetView.js @@ -156,51 +156,29 @@ define(function(require) { }, createCourseAsset: function (courseAssetObject, callback, context) { - // Has this field been set already? - var update = this.findAsset(courseAssetObject.contentTypeId, courseAssetObject.contentType, courseAssetObject.fieldname); - - // Update should only happen if the assetId is different - if (update && update.get('_assetId') != courseAssetObject.assetId) { - // If so, update it ... - update.save({ _assetId: courseAssetObject.assetId },{ - error: function() { - alert('An error occurred doing the save'); - }, - success: function() { - Origin.editor.data.courseAssets.fetch({ - reset:true, - success: function() { - callback.apply(context); - } - }); - } - }); - } else if (!update) { - var courseAsset = new EditorCourseAssetModel(); - // ... otherwise, create it - courseAsset.save({ - _courseId : Origin.editor.data.course.get('_id'), - _contentType : courseAssetObject.contentType, - _contentTypeId : courseAssetObject.contentTypeId, - _fieldName : courseAssetObject.fieldname, - _assetId : courseAssetObject.assetId, - _contentTypeParentId: courseAssetObject.contentTypeParentId - },{ - error: function(error) { - alert('An error occurred doing the save'); - }, - success: function() { - Origin.editor.data.courseAssets.fetch({ - reset:true, - success: function() { - callback.apply(context); - } - }); - } - }); - } else { - callback.apply(context); - } + + var courseAsset = new EditorCourseAssetModel(); + courseAsset.save({ + _courseId : Origin.editor.data.course.get('_id'), + _contentType : courseAssetObject.contentType, + _contentTypeId : courseAssetObject.contentTypeId, + _fieldName : courseAssetObject.fieldname, + _assetId : courseAssetObject.assetId, + _contentTypeParentId: courseAssetObject.contentTypeParentId + },{ + error: function(error) { + alert('An error occurred doing the save'); + }, + success: function() { + Origin.editor.data.courseAssets.fetch({ + reset:true, + success: function() { + callback.apply(context); + } + }); + } + }); + }, removeCourseAsset: function (contentTypeId, contentType, fieldname) { From b0e7eed60621a4b897f4c968885ef4b63424ab0b Mon Sep 17 00:00:00 2001 From: Daryl Hedley Date: Thu, 16 Apr 2015 15:54:15 +0100 Subject: [PATCH 2/8] Few more additions to the assetView --- .../src/core/scaffold/templates/scaffoldAsset.hbs | 8 +++++++- .../src/core/scaffold/views/scaffoldAssetView.js | 12 ++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/frontend/src/core/scaffold/templates/scaffoldAsset.hbs b/frontend/src/core/scaffold/templates/scaffoldAsset.hbs index 0f5734a696..7d624ff8d1 100644 --- a/frontend/src/core/scaffold/templates/scaffoldAsset.hbs +++ b/frontend/src/core/scaffold/templates/scaffoldAsset.hbs @@ -1 +1,7 @@ - \ No newline at end of file + +{{console this}} +{{#if value}} + +{{else}} + +{{/if}} \ No newline at end of file diff --git a/frontend/src/core/scaffold/views/scaffoldAssetView.js b/frontend/src/core/scaffold/views/scaffoldAssetView.js index 7e02d9716a..832647c5e0 100644 --- a/frontend/src/core/scaffold/views/scaffoldAssetView.js +++ b/frontend/src/core/scaffold/views/scaffoldAssetView.js @@ -44,7 +44,7 @@ define(function(require) { }, render: function() { - this.$el.append(Handlebars.templates[this.constructor.template]()); + this.$el.html(Handlebars.templates[this.constructor.template]({value: this.value})); this.setValue(this.value); // Should see if the field contains anything on render // if so disable it @@ -127,8 +127,8 @@ define(function(require) { this.createCourseAsset(courseAssetObject, function() { - this.setValue(data.assetLink); - this.toggleFieldAvailibility(); + this.value = data.assetLink; + this.render(); }, this); } @@ -141,8 +141,8 @@ define(function(require) { onClearButtonClicked: function(event) { event.preventDefault(); - this.setValue(''); - this.toggleFieldAvailibility(); + this.value = ''; + this.render(); this.checkValueHasChanged(); }, @@ -178,7 +178,7 @@ define(function(require) { }); } }); - + }, removeCourseAsset: function (contentTypeId, contentType, fieldname) { From 9f34ffe0ae8cd39f91fdcbdf75eab0b3d2bedbcb Mon Sep 17 00:00:00 2001 From: Daryl Hedley Date: Thu, 16 Apr 2015 17:23:12 +0100 Subject: [PATCH 3/8] Enhancements to backbone forms asset selection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Adds validate:false override as we don’t use backbone.model.validate - Fixes getting and setting of assets - Adds Origin.scaffold.getCurrentForm for all your form goodiness --- frontend/src/core/scaffold/scaffold.js | 6 ++ .../src/core/scaffold/scaffoldOverrides.js | 56 +++++++++++++++++++ .../core/scaffold/views/scaffoldAssetView.js | 51 ++++++++++++++--- 3 files changed, 104 insertions(+), 9 deletions(-) diff --git a/frontend/src/core/scaffold/scaffold.js b/frontend/src/core/scaffold/scaffold.js index bd078e465a..e39d5fa9d2 100644 --- a/frontend/src/core/scaffold/scaffold.js +++ b/frontend/src/core/scaffold/scaffold.js @@ -21,6 +21,7 @@ define(function(require) { var Scaffold = {}; // Used to pass model data around the current form var currentModel; + var currentForm; // Used to store already build schemas var builtSchemas = {}; @@ -286,6 +287,7 @@ define(function(require) { options.fieldsets = buildFieldsets(schema, options); currentModel = options.model; var form = new Backbone.Form(options).render(); + currentForm = form; return form; } @@ -333,6 +335,10 @@ define(function(require) { return currentModel; } + Scaffold.getCurrentForm = function() { + return currentForm; + } + // Listen to modal views Origin.on('scaffold:increaseActiveModals', function() { ActiveItemsModal++; diff --git a/frontend/src/core/scaffold/scaffoldOverrides.js b/frontend/src/core/scaffold/scaffoldOverrides.js index 9c65e369f4..05fb6910a4 100644 --- a/frontend/src/core/scaffold/scaffoldOverrides.js +++ b/frontend/src/core/scaffold/scaffoldOverrides.js @@ -92,4 +92,60 @@ define(function(require) { return this.editor.getData(); } + Backbone.Form.prototype.validate = function(options) { + var self = this, + fields = this.fields, + model = this.model, + errors = {}; + + options = options || {}; + + //Collect errors from schema validation + // !!!OVERRIDE Passing in validate:false will stop the validation of the backbone forms validators + if (!options.skipModelValidate) { + _.each(fields, function(field) { + var error = field.validate(); + if (error) { + errors[field.key] = error; + } + }); + } + + //Get errors from default Backbone model validator + if (!options.skipModelValidate && model && model.validate) { + var modelErrors = model.validate(this.getValue()); + + if (modelErrors) { + var isDictionary = _.isObject(modelErrors) && !_.isArray(modelErrors); + + //If errors are not in object form then just store on the error object + if (!isDictionary) { + errors._others = errors._others || []; + errors._others.push(modelErrors); + } + + //Merge programmatic errors (requires model.validate() to return an object e.g. { fieldKey: 'error' }) + if (isDictionary) { + _.each(modelErrors, function(val, key) { + //Set error on field if there isn't one already + if (fields[key] && !errors[key]) { + fields[key].setError(val); + errors[key] = val; + } + + else { + //Otherwise add to '_others' key + errors._others = errors._others || []; + var tmpErr = {}; + tmpErr[key] = val; + errors._others.push(tmpErr); + } + }); + } + } + } + + return _.isEmpty(errors) ? null : errors; + } + }); \ No newline at end of file diff --git a/frontend/src/core/scaffold/views/scaffoldAssetView.js b/frontend/src/core/scaffold/views/scaffoldAssetView.js index 832647c5e0..0beb0764ed 100644 --- a/frontend/src/core/scaffold/views/scaffoldAssetView.js +++ b/frontend/src/core/scaffold/views/scaffoldAssetView.js @@ -54,10 +54,12 @@ define(function(require) { }, getValue: function() { + return this.value || ''; return this.$('input').val(); }, setValue: function(value) { + this.value = value; this.$('input').val(value); }, @@ -124,10 +126,9 @@ define(function(require) { assetId: assetId } - + this.value = data.assetLink; this.createCourseAsset(courseAssetObject, function() { - this.value = data.assetLink; this.render(); }, this); @@ -141,9 +142,9 @@ define(function(require) { onClearButtonClicked: function(event) { event.preventDefault(); - this.value = ''; - this.render(); this.checkValueHasChanged(); + this.value = ''; + //this.render(); }, findAsset: function (contentTypeId, contentType, fieldname) { @@ -156,6 +157,7 @@ define(function(require) { }, createCourseAsset: function (courseAssetObject, callback, context) { + var self = this; var courseAsset = new EditorCourseAssetModel(); courseAsset.save({ @@ -170,23 +172,54 @@ define(function(require) { alert('An error occurred doing the save'); }, success: function() { - Origin.editor.data.courseAssets.fetch({ - reset:true, + var currentModel = Origin.scaffold.getCurrentModel(); + var currentForm = Origin.scaffold.getCurrentForm(); + var errors = currentForm.commit({validate: false}); + + currentModel.pruneAttributes(); + + currentModel.save(null, { + error: function() { + alert('An error occurred doing the save'); + }, success: function() { - callback.apply(context); + + Origin.editor.data.courseAssets.fetch({ + reset:true, + success: function() { + callback.apply(context); + } + }); + } - }); + }) } }); }, removeCourseAsset: function (contentTypeId, contentType, fieldname) { + var that = this; var courseAsset = this.findAsset(contentTypeId, contentType, fieldname); if (courseAsset) { courseAsset.destroy({ success: function(success) { - Origin.editor.data.courseAssets.fetch({reset:true}); + var currentModel = Origin.scaffold.getCurrentModel(); + var currentForm = Origin.scaffold.getCurrentForm(); + var errors = currentForm.commit({validate: false}); + + currentModel.pruneAttributes(); + + currentModel.save(null, { + error: function() { + alert('An error occurred doing the save'); + }, + success: function() { + that.render(); + Origin.editor.data.courseAssets.fetch({reset:true}); + + } + }) }, error: function(error) { console.log('error', error); From 19a41d40cfc95d5c180ad80c190c0304cae6c8a0 Mon Sep 17 00:00:00 2001 From: Daryl Hedley Date: Wed, 29 Apr 2015 10:47:10 +0100 Subject: [PATCH 4/8] Adds ability to autofill the graphic component images --- .../assetManagementModalAutofill.hbs | 1 + .../views/assetManagementModalAutofillView.js | 46 +++++++++++++++++++ .../views/assetManagementModalView.js | 8 ++++ frontend/src/core/modal/templates/modal.hbs | 22 +++++---- frontend/src/core/scaffold/scaffold.js | 1 - .../core/scaffold/views/scaffoldAssetView.js | 15 +++++- 6 files changed, 81 insertions(+), 12 deletions(-) create mode 100644 frontend/src/core/assetManagement/templates/assetManagementModalAutofill.hbs create mode 100644 frontend/src/core/assetManagement/views/assetManagementModalAutofillView.js diff --git a/frontend/src/core/assetManagement/templates/assetManagementModalAutofill.hbs b/frontend/src/core/assetManagement/templates/assetManagementModalAutofill.hbs new file mode 100644 index 0000000000..74c682d94d --- /dev/null +++ b/frontend/src/core/assetManagement/templates/assetManagementModalAutofill.hbs @@ -0,0 +1 @@ +Autofill \ No newline at end of file diff --git a/frontend/src/core/assetManagement/views/assetManagementModalAutofillView.js b/frontend/src/core/assetManagement/views/assetManagementModalAutofillView.js new file mode 100644 index 0000000000..74fc2e011b --- /dev/null +++ b/frontend/src/core/assetManagement/views/assetManagementModalAutofillView.js @@ -0,0 +1,46 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + + var Origin = require('coreJS/app/origin'); + var Backbone = require('backbone'); + + var AssetManagementModalAutofillView = Backbone.View.extend({ + + className: 'asset-management-modal-autofill', + + tagName: 'button', + + events: { + 'click': 'onAutofillClicked' + }, + + initialize: function(options) { + this.options = options; + this.listenTo(Origin, 'modal:closed', this.remove); + this.listenTo(Origin, 'remove:views', this.remove); + this.render(); + }, + + render: function() { + var data = this.options; + var template = Handlebars.templates['assetManagementModalAutofill']; + this.$el.html(template(data)).prependTo('.model-popup-toolbar-buttons'); + _.defer(_.bind(this.postRender, this)); + + return this; + }, + + postRender: function() { + }, + + onAutofillClicked: function(event) { + event.preventDefault(); + this.options.modalView.data._shouldAutofill = true; + Origin.trigger('modal:onUpdate'); + } + + }); + + return AssetManagementModalAutofillView; + +}); diff --git a/frontend/src/core/assetManagement/views/assetManagementModalView.js b/frontend/src/core/assetManagement/views/assetManagementModalView.js index 60fb9dcd0e..95425ffbb5 100644 --- a/frontend/src/core/assetManagement/views/assetManagementModalView.js +++ b/frontend/src/core/assetManagement/views/assetManagementModalView.js @@ -8,6 +8,7 @@ define(function(require) { var AssetManagementPreviewView = require('coreJS/assetManagement/views/assetManagementPreviewView'); var AssetManagementView = require('coreJS/assetManagement/views/assetManagementView'); var AssetManagementModalFiltersView = require('coreJS/assetManagement/views/assetManagementModalFiltersView'); + var AssetManagementModelAutofillView = require('coreJS/assetManagement/views/assetManagementModalAutofillView'); var AssetManagementModalView = AssetManagementView.extend({ @@ -19,6 +20,9 @@ define(function(require) { postRender: function() { this.setupSubViews(); this.setupFilterAndSearchView(); + if (this.options.assetType === "Asset:image" && Origin.scaffold.getCurrentModel().get('_component') === 'graphic') { + this.setupImageAutofillButton(); + } this.resizeAssetPanels(); }, @@ -35,6 +39,10 @@ define(function(require) { new AssetManagementModalFiltersView(this.options); }, + setupImageAutofillButton: function() { + new AssetManagementModelAutofillView({modalView: this}); + }, + resizeAssetPanels: function() { var navigationHeight = $('.navigation').outerHeight(); var windowHeight = $(window).height(); diff --git a/frontend/src/core/modal/templates/modal.hbs b/frontend/src/core/modal/templates/modal.hbs index c92b3a2c83..13133726d6 100644 --- a/frontend/src/core/modal/templates/modal.hbs +++ b/frontend/src/core/modal/templates/modal.hbs @@ -5,16 +5,18 @@

{{title}}

{{/if}} - {{#if _shouldShowDoneButton}} - - {{/if}} - {{#if _shouldShowCancelButton}} - - {{/if}} +
+ {{#if _shouldShowDoneButton}} + + {{/if}} + {{#if _shouldShowCancelButton}} + + {{/if}} +
{{#if body}} diff --git a/frontend/src/core/scaffold/scaffold.js b/frontend/src/core/scaffold/scaffold.js index 4acfca3353..0a2ee4d013 100644 --- a/frontend/src/core/scaffold/scaffold.js +++ b/frontend/src/core/scaffold/scaffold.js @@ -45,7 +45,6 @@ define(function(require) { } var setupSchemaFields = function(field, key, schema, scaffoldSchema) { - if (field.type === 'array') { if (field.items && field.items.properties) { diff --git a/frontend/src/core/scaffold/views/scaffoldAssetView.js b/frontend/src/core/scaffold/views/scaffoldAssetView.js index 3e79258c97..ac75a171f0 100644 --- a/frontend/src/core/scaffold/views/scaffoldAssetView.js +++ b/frontend/src/core/scaffold/views/scaffoldAssetView.js @@ -38,11 +38,17 @@ define(function(require) { }, initialize: function(options) { + this.listenTo(Origin, 'scaffold:assets:autofill', this.onAutofill); // Call parent constructor Backbone.Form.editors.Base.prototype.initialize.call(this, options); }, + onAutofill: function(courseAssetObject, value) { + this.value = value; + this.createCourseAsset(courseAssetObject); + }, + render: function() { var assetType = this.schema.fieldType.replace('Asset:', ''); this.$el.html(Handlebars.templates[this.constructor.template]({value: this.value, type: assetType})); @@ -131,6 +137,13 @@ define(function(require) { assetId: assetId } + // If the data is meant to autofill the rest of the graphic sizes + // pass out an event instead - this is currently only used for the graphic component + if (data._shouldAutofill) { + Origin.trigger('scaffold:assets:autofill', courseAssetObject, data.assetLink); + return; + } + this.value = data.assetLink; this.createCourseAsset(courseAssetObject); @@ -159,7 +172,7 @@ define(function(require) { return asset ? asset : false; }, - createCourseAsset: function (courseAssetObject, callback, context) { + createCourseAsset: function (courseAssetObject) { var self = this; var courseAsset = new EditorCourseAssetModel(); From 19f4f49aa4538fd36746797823417be3e162715d Mon Sep 17 00:00:00 2001 From: Daryl Hedley Date: Wed, 29 Apr 2015 22:04:16 +0100 Subject: [PATCH 5/8] Asset management external links - Adds ability to link external assets - Gives a more detailed err output when pressing preview and it runs an external grunt task - Matches model data to hidden input value --- frontend/src/core/app/helpers.js | 15 +++- .../src/core/scaffold/less/scaffoldAsset.less | 4 ++ .../core/scaffold/templates/scaffoldAsset.hbs | 70 ++++++++++++++---- .../core/scaffold/views/scaffoldAssetView.js | 72 +++++++++++++++---- frontend/src/less/buttons.less | 6 ++ plugins/output/adapt/index.js | 1 + 6 files changed, 137 insertions(+), 31 deletions(-) diff --git a/frontend/src/core/app/helpers.js b/frontend/src/core/app/helpers.js index 8e95be140a..43eee7d255 100644 --- a/frontend/src/core/app/helpers.js +++ b/frontend/src/core/app/helpers.js @@ -184,11 +184,11 @@ define(function(require){ var courseAssetId = courseAsset.get('_assetId'); return '/api/asset/serve/' + courseAssetId; - //return '/asset/serve/' - //'/asset/serve/:id' + }, getThumbnailFromValue: function(url) { + var urlSplit = url.split('/') var fileName = urlSplit[urlSplit.length - 1]; // Get courseAsset model @@ -200,6 +200,17 @@ define(function(require){ return '/api/asset/thumb/' + url; } + }, + + ifAssetIsExternal: function(url, block) { + + var urlSplit = url.split('/') + + if (urlSplit[0] != "course" && urlSplit[1] != "assets") { + return block.fn(this); + } else { + return block.inverse(this); + } } diff --git a/frontend/src/core/scaffold/less/scaffoldAsset.less b/frontend/src/core/scaffold/less/scaffoldAsset.less index d7cea4f9d4..f356aa714d 100644 --- a/frontend/src/core/scaffold/less/scaffoldAsset.less +++ b/frontend/src/core/scaffold/less/scaffoldAsset.less @@ -19,4 +19,8 @@ color:inherit; } } +} + +.scaffold-asset-external-input-buttons { + margin-top:10px; } \ No newline at end of file diff --git a/frontend/src/core/scaffold/templates/scaffoldAsset.hbs b/frontend/src/core/scaffold/templates/scaffoldAsset.hbs index c15eaa93d5..78cb333460 100644 --- a/frontend/src/core/scaffold/templates/scaffoldAsset.hbs +++ b/frontend/src/core/scaffold/templates/scaffoldAsset.hbs @@ -1,35 +1,75 @@ -{{!-- --}} {{#if value}} -{{console this}} - {{! Work out which type it is and display the correct html markup}} {{#ifValueEquals type 'image'}} - + {{#ifAssetIsExternal value}} + + {{else}} + + {{/ifAssetIsExternal}} {{/ifValueEquals}} {{#ifValueEquals type 'other'}} - - -
{{value}}
- + {{#ifAssetIsExternal value}} + + +
{{value}}
+ + {{else}} + + +
{{value}}
+ + {{/ifAssetIsExternal}} + {{/ifValueEquals}} {{#ifValueEquals type 'video'}} - + {{#ifAssetIsExternal value}} + + +
{{value}}
+ + {{else}} + + {{/ifAssetIsExternal}} {{/ifValueEquals}} {{#ifValueEquals type 'audio'}} - - -
{{value}}
- + {{#ifAssetIsExternal value}} + + +
{{value}}
+ + {{else}} + + +
{{value}}
+ + {{/ifAssetIsExternal}} + {{/ifValueEquals}} +
- + {{#ifAssetIsExternal value}} + + {{else}} + + {{/ifAssetIsExternal}}
+ {{else}} + + +
- + +
{{/if}} \ No newline at end of file diff --git a/frontend/src/core/scaffold/views/scaffoldAssetView.js b/frontend/src/core/scaffold/views/scaffoldAssetView.js index ac75a171f0..6985ebda9c 100644 --- a/frontend/src/core/scaffold/views/scaffoldAssetView.js +++ b/frontend/src/core/scaffold/views/scaffoldAssetView.js @@ -33,7 +33,11 @@ define(function(require) { // This call automatically sets `this.hasFocus` to `false`. }, 'click .scaffold-asset-picker': 'onAssetButtonClicked', - 'click .scaffold-asset-clear': 'onClearButtonClicked' + 'click .scaffold-asset-external': 'onExternalAssetButtonClicked', + 'click .scaffold-asset-clear': 'onClearButtonClicked', + 'click .scaffold-asset-external-input-save': 'onExternalAssetSaveClicked', + 'click .scaffold-asset-external-input-cancel': 'onExternalAssetCancelClicked', + 'click .scaffold-asset-clear-external': 'onExternalClearButtonClicked' }, @@ -90,16 +94,16 @@ define(function(require) { toggleFieldAvailibility: function() { if (this.getValue().length === 0) { this.$('input').attr('disabled', false); - this.$('.scaffold-asset-clear').addClass('display-none'); + //this.$('.scaffold-asset-clear').addClass('display-none'); } else { - this.$('.scaffold-asset-clear').removeClass('display-none'); + //this.$('.scaffold-asset-clear').removeClass('display-none'); this.$('input').attr('disabled', true); } }, checkValueHasChanged: function() { if ('heroImage' === this.key){ - this.saveModel(); + this.saveModel(true); return; } var contentTypeId = Origin.scaffold.getCurrentModel().get('_id'); @@ -108,6 +112,32 @@ define(function(require) { this.removeCourseAsset(contentTypeId, contentType, fieldname); }, + onExternalAssetButtonClicked: function(event) { + event.preventDefault(); + this.$('.scaffold-asset-external-input').removeClass('display-none'); + this.$('.scaffold-asset-buttons').addClass('display-none'); + }, + + onExternalAssetSaveClicked: function(event) { + event.preventDefault(); + var inputValue = this.$('.scaffold-asset-external-input-field').val(); + // Check that there's actually some value + if (inputValue.length > 0) { + this.value = inputValue; + this.saveModel(false); + } else { + // If nothing don't bother saving - instead revert to showing the buttons again + this.$('.scaffold-asset-external-input').addClass('display-none'); + this.$('.scaffold-asset-buttons').removeClass('display-none'); + } + }, + + onExternalAssetCancelClicked: function(event) { + event.preventDefault(); + this.$('.scaffold-asset-external-input').addClass('display-none'); + this.$('.scaffold-asset-buttons').removeClass('display-none'); + }, + onAssetButtonClicked: function(event) { event.preventDefault(); Origin.trigger('modal:open', AssetManagementModalView, { @@ -118,7 +148,7 @@ define(function(require) { if ('heroImage' === this.key){ this.setValue(data.assetId); - this.saveModel(); + this.saveModel(true); return; } // Setup courseasset @@ -163,6 +193,13 @@ define(function(require) { this.toggleFieldAvailibility(); }, + onExternalClearButtonClicked: function() { + event.preventDefault(); + this.setValue(''); + this.saveModel(false); + this.toggleFieldAvailibility(); + }, + findAsset: function (contentTypeId, contentType, fieldname) { var asset = Origin.editor.data.courseAssets.findWhere({ _contentTypeId: contentTypeId, @@ -188,7 +225,7 @@ define(function(require) { alert('An error occurred doing the save'); }, success: function() { - self.saveModel(); + self.saveModel(true); } }); @@ -200,7 +237,7 @@ define(function(require) { if (courseAsset) { courseAsset.destroy({ success: function(success) { - that.saveModel(); + that.saveModel(true); }, error: function(error) { console.log('error', error); @@ -209,7 +246,7 @@ define(function(require) { } }, - saveModel: function() { + saveModel: function(shouldResetAssetCollection) { var that = this; var currentModel = Origin.scaffold.getCurrentModel(); var currentForm = Origin.scaffold.getCurrentForm(); @@ -222,12 +259,19 @@ define(function(require) { alert('An error occurred doing the save'); }, success: function() { - Origin.editor.data.courseAssets.fetch({ - reset:true, - success: function() { - that.render(); - } - }); + // Sometimes we don't need to reset the courseAssets + if (shouldResetAssetCollection) { + + Origin.editor.data.courseAssets.fetch({ + reset:true, + success: function() { + that.render(); + } + }); + + } else { + that.render(); + } } }) } diff --git a/frontend/src/less/buttons.less b/frontend/src/less/buttons.less index 1f15ab3fe7..4e7fc79fb2 100644 --- a/frontend/src/less/buttons.less +++ b/frontend/src/less/buttons.less @@ -87,6 +87,12 @@ button { background-color:@button-primary-color; color:@button-primary-text-color; border:1px solid @button-primary-color; + i { + color:@button-primary-text-color; + &:hover, &:focus { + color:@button-primary-hover-text-color; + } + } &:hover, &:focus { background-color:@button-primary-hover-color; color:@button-primary-hover-text-color; diff --git a/plugins/output/adapt/index.js b/plugins/output/adapt/index.js index 7b89944b2d..0f746d397c 100644 --- a/plugins/output/adapt/index.js +++ b/plugins/output/adapt/index.js @@ -161,6 +161,7 @@ AdaptOutput.prototype.publish = function (courseId, isPreview, request, response function (error, stdout, stderr) { if (error !== null) { logger.log('error', 'exec error: ' + error); + logger.log('error', 'stdout error: ' + stdout); resultObject.success = true; return callback(error, 'Error building framework'); } From 6c45af4b639e0df1434d6cc9d9313422133b1803 Mon Sep 17 00:00:00 2001 From: Daryl Hedley Date: Wed, 29 Apr 2015 22:11:32 +0100 Subject: [PATCH 6/8] Bug fix with modalView autofill button being clicked without selecting an asset --- .../views/assetManagementModalAutofillView.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/frontend/src/core/assetManagement/views/assetManagementModalAutofillView.js b/frontend/src/core/assetManagement/views/assetManagementModalAutofillView.js index 74fc2e011b..0e0b89ab84 100644 --- a/frontend/src/core/assetManagement/views/assetManagementModalAutofillView.js +++ b/frontend/src/core/assetManagement/views/assetManagementModalAutofillView.js @@ -35,8 +35,13 @@ define(function(require) { onAutofillClicked: function(event) { event.preventDefault(); - this.options.modalView.data._shouldAutofill = true; - Origin.trigger('modal:onUpdate'); + // Sometimes the button can be clicked without selecting an asset + if (this.options.modalView.data) { + this.options.modalView.data._shouldAutofill = true; + Origin.trigger('modal:onUpdate'); + } else { + Origin.trigger('modal:onCancel'); + } } }); From f75d8d7a0b424b083d36d51d00f8bb41d7c29123 Mon Sep 17 00:00:00 2001 From: Daryl Hedley Date: Thu, 30 Apr 2015 16:50:01 +0100 Subject: [PATCH 7/8] Few more updates to hero image previews --- frontend/src/core/app/helpers.js | 13 +++++++++++++ .../src/core/scaffold/templates/scaffoldAsset.hbs | 6 +++++- .../src/core/scaffold/views/scaffoldAssetView.js | 4 ++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/frontend/src/core/app/helpers.js b/frontend/src/core/app/helpers.js index 43eee7d255..02c649c6d3 100644 --- a/frontend/src/core/app/helpers.js +++ b/frontend/src/core/app/helpers.js @@ -205,6 +205,10 @@ define(function(require){ ifAssetIsExternal: function(url, block) { var urlSplit = url.split('/') + // Could well be a hero image for the course + if (urlSplit.length === 1) { + return block.inverse(this); + } if (urlSplit[0] != "course" && urlSplit[1] != "assets") { return block.fn(this); @@ -212,6 +216,15 @@ define(function(require){ return block.inverse(this); } + }, + + ifAssetIsHeroImage: function(url, block) { + var urlSplit = url.split('/') + if (urlSplit.length === 1) { + return block.fn(this); + } else { + return block.inverse(this); + } } }; diff --git a/frontend/src/core/scaffold/templates/scaffoldAsset.hbs b/frontend/src/core/scaffold/templates/scaffoldAsset.hbs index 78cb333460..a588e5df05 100644 --- a/frontend/src/core/scaffold/templates/scaffoldAsset.hbs +++ b/frontend/src/core/scaffold/templates/scaffoldAsset.hbs @@ -5,7 +5,11 @@ {{#ifAssetIsExternal value}} {{else}} - + {{#ifAssetIsHeroImage value}} + + {{else}} + + {{/ifAssetIsHeroImage}} {{/ifAssetIsExternal}} {{/ifValueEquals}} diff --git a/frontend/src/core/scaffold/views/scaffoldAssetView.js b/frontend/src/core/scaffold/views/scaffoldAssetView.js index 6985ebda9c..07cbfe5126 100644 --- a/frontend/src/core/scaffold/views/scaffoldAssetView.js +++ b/frontend/src/core/scaffold/views/scaffoldAssetView.js @@ -7,7 +7,7 @@ define(function(require) { var AssetManagementModalView = require('coreJS/assetManagement/views/assetManagementModalView'); var AssetCollection = require('coreJS/assetManagement/collections/assetCollection'); var EditorCourseAssetModel = require('editorCourse/models/editorCourseAssetModel'); - + var ScaffoldAssetView = Backbone.Form.editors.Base.extend({ tagName: 'div', @@ -193,7 +193,7 @@ define(function(require) { this.toggleFieldAvailibility(); }, - onExternalClearButtonClicked: function() { + onExternalClearButtonClicked: function(event) { event.preventDefault(); this.setValue(''); this.saveModel(false); From 783e23476ac0b769f4742aaf56893c1addbecc4f Mon Sep 17 00:00:00 2001 From: Daryl Hedley Date: Wed, 6 May 2015 14:12:09 +0100 Subject: [PATCH 8/8] Updated to enable alternative models for saving with assets --- frontend/src/core/scaffold/scaffold.js | 14 ++++++++ .../core/scaffold/views/scaffoldAssetView.js | 33 ++++++++++++++++--- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/frontend/src/core/scaffold/scaffold.js b/frontend/src/core/scaffold/scaffold.js index 0a2ee4d013..5174ae0673 100644 --- a/frontend/src/core/scaffold/scaffold.js +++ b/frontend/src/core/scaffold/scaffold.js @@ -23,6 +23,10 @@ define(function(require) { var currentModel; var currentForm; + // Used to pass an alternative model and alternative attribute to save + var alternativeModel; + var alternativeAttribute; + // Used to store already build schemas var builtSchemas = {}; @@ -284,6 +288,8 @@ define(function(require) { options.model.schema = buildSchema(schema, options, type); options.fieldsets = buildFieldsets(schema, options); + alternativeModel = options.alternativeModelToSave; + alternativeAttribute = options.alternativeAttributeToSave; currentModel = options.model; var form = new Backbone.Form(options).render(); currentForm = form; @@ -338,6 +344,14 @@ define(function(require) { return currentForm; } + Scaffold.getAlternativeModel = function() { + return alternativeModel + } + + Scaffold.getAlternativeAttribute = function() { + return alternativeAttribute + } + // Listen to modal views Origin.on('scaffold:increaseActiveModals', function() { ActiveItemsModal++; diff --git a/frontend/src/core/scaffold/views/scaffoldAssetView.js b/frontend/src/core/scaffold/views/scaffoldAssetView.js index 07cbfe5126..cf4eb4e6e9 100644 --- a/frontend/src/core/scaffold/views/scaffoldAssetView.js +++ b/frontend/src/core/scaffold/views/scaffoldAssetView.js @@ -201,11 +201,17 @@ define(function(require) { }, findAsset: function (contentTypeId, contentType, fieldname) { - var asset = Origin.editor.data.courseAssets.findWhere({ - _contentTypeId: contentTypeId, + var searchCriteria = { _contentType: contentType, _fieldName: fieldname - }); + }; + + if (contentTypeId) { + searchCriteria._contentTypeId = contentTypeId; + } else { + searchCriteria._contentTypeParentId = Origin.editor.data.course.get('_id'); + } + var asset = Origin.editor.data.courseAssets.findWhere(searchCriteria); return asset ? asset : false; }, @@ -248,13 +254,30 @@ define(function(require) { saveModel: function(shouldResetAssetCollection) { var that = this; - var currentModel = Origin.scaffold.getCurrentModel(); + var attributesToSave = {}; + var isUsingAlternativeModel = false; + var currentModel = Origin.scaffold.getCurrentModel() + var alternativeModel = Origin.scaffold.getAlternativeModel(); + var alternativeAttribute = Origin.scaffold.getAlternativeAttribute(); + // Check if alternative model should be used + if (alternativeModel) { + currentModel = alternativeModel; + isUsingAlternativeModel = true; + } + var currentForm = Origin.scaffold.getCurrentForm(); var errors = currentForm.commit({validate: false}); + currentModel.pruneAttributes(); + // Check if alternative attribute should be used + if (alternativeAttribute) { + attributesToSave[alternativeAttribute] = Origin.scaffold.getCurrentModel().attributes; + } else { + attributesToSave = null; + } - currentModel.save(null, { + currentModel.save(attributesToSave, { error: function() { alert('An error occurred doing the save'); },