diff --git a/cms/static/client_templates/metadata_editor.html b/cms/static/client_templates/metadata_editor.html
index 34723edb8e..9c9ae2487d 100644
--- a/cms/static/client_templates/metadata_editor.html
+++ b/cms/static/client_templates/metadata_editor.html
@@ -3,4 +3,4 @@
<% }) %>
-
\ No newline at end of file
+
diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee
index 244d5b9576..c0ac56bb48 100644
--- a/cms/static/coffee/src/views/module_edit.coffee
+++ b/cms/static/coffee/src/views/module_edit.coffee
@@ -26,7 +26,7 @@ class CMS.Views.ModuleEdit extends Backbone.View
metadataEditor = @$el.find('.metadata_edit')
@metadataEditor = new CMS.Views.Metadata.Editor({
el: metadataEditor,
- model: new CMS.Models.MetadataEditor(metadataEditor.data('metadata'))
+ model: new Backbone.Model(metadataEditor.data('metadata'))
});
#Manually runs polyfill for input number types to correct for Firefox non-support
@@ -39,7 +39,10 @@ class CMS.Views.ModuleEdit extends Backbone.View
@selectMode(@editorMode)
else
@hideDataEditor()
- @$el.find('.component-name').html('Editing: ' + @metadataEditor.getDisplayName())
+
+ title = interpolate(gettext('Editing: %s'),
+ [@metadataEditor.getDisplayName()])
+ @$el.find('.component-name').html(title)
changedMetadata: ->
return @metadataEditor.getModifiedMetadataValues()
@@ -77,7 +80,7 @@ class CMS.Views.ModuleEdit extends Backbone.View
@render()
@$el.removeClass('editing')
).fail( ->
- showToastMessage("There was an error saving your changes. Please try again.", null, 3)
+ showToastMessage(gettext("There was an error saving your changes. Please try again."), null, 3)
)
clickCancelButton: (event) ->
@@ -131,4 +134,4 @@ class CMS.Views.ModuleEdit extends Backbone.View
editorModeButtonParent.addClass('inactive-mode')
editorModeButtonParent.removeClass('active-mode')
@$el.find('.wrapper-comp-settings').addClass('is-active')
- @$el.find('#settings-mode').find("a").addClass('is-set')
\ No newline at end of file
+ @$el.find('#settings-mode').find("a").addClass('is-set')
diff --git a/cms/static/js/models/metadata_editor.js b/cms/static/js/models/metadata_editor.js
deleted file mode 100644
index 334d8aa718..0000000000
--- a/cms/static/js/models/metadata_editor.js
+++ /dev/null
@@ -1,8 +0,0 @@
-CMS.Models.MetadataEditor = Backbone.Model.extend({
- // This model class is not suited for restful operations and is considered just a server side initialized container
- url: '',
-
- defaults: {
- }
-
-});
diff --git a/cms/static/js/views/metadata_editor_view.js b/cms/static/js/views/metadata_editor_view.js
index 633c766923..b02086f3bd 100644
--- a/cms/static/js/views/metadata_editor_view.js
+++ b/cms/static/js/views/metadata_editor_view.js
@@ -22,22 +22,24 @@ CMS.Views.Metadata.Editor = Backbone.View.extend({
return val.display_name
});
- self.views = [];
+ self.models = [];
_.each(sortedObject,
function (item) {
+ var model = new CMS.Models.Metadata(item);
+ self.models.push(model);
var data = {
el: self.$el.find('.metadata_entry')[counter++],
- model: new CMS.Models.Metadata(item)
+ model: model
};
if (item.type === 'Select') {
- self.views.push(new CMS.Views.Metadata.Option(data));
+ new CMS.Views.Metadata.Option(data);
}
else if (item.type === 'Integer' || item.type === 'Float') {
- self.views.push(new CMS.Views.Metadata.Number(data));
+ new CMS.Views.Metadata.Number(data);
}
else {
- self.views.push(new CMS.Views.Metadata.String(data));
+ new CMS.Views.Metadata.String(data);
}
});
}
@@ -46,10 +48,10 @@ CMS.Views.Metadata.Editor = Backbone.View.extend({
getModifiedMetadataValues: function () {
var modified_values = {};
- _.each(this.views,
- function (item) {
- if (item.modified()) {
- modified_values[item.getFieldName()] = item.getValue();
+ _.each(this.models,
+ function (model) {
+ if (model.isModified()) {
+ modified_values[model.getFieldName()] = model.getValue();
}
}
);
@@ -118,19 +120,6 @@ CMS.Views.Metadata.AbstractEditor = Backbone.View.extend({
this.$el.find('.setting-clear').addClass('inactive');
this.$el.find('.setting-clear').removeClass('active');
}
- },
-
-
- modified: function () {
- return this.model.isModified();
- },
-
- getValue: function() {
- return this.model.getValue();
- },
-
- getFieldName: function() {
- return this.model.getFieldName();
}
});
@@ -147,9 +136,7 @@ CMS.Views.Metadata.String = CMS.Views.Metadata.AbstractEditor.extend({
},
getValueFromEditor : function () {
- var val = this.$el.find('#' + this.uniqueId).val();
-// TODO: not sure this is necessary. Trying to support empty value ("").
- return val ? val : "";
+ return this.$el.find('#' + this.uniqueId).val();
},
setValueInEditor : function (value) {
@@ -244,6 +231,3 @@ CMS.Views.Metadata.Option = CMS.Views.Metadata.AbstractEditor.extend({
}).prop('selected', true);
}
});
-
-
-
diff --git a/cms/templates/base.html b/cms/templates/base.html
index 83627ba3e6..701101d7a8 100644
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
@@ -55,7 +55,6 @@
-
-<%include file="metadata-edit.html" />
\ No newline at end of file
+<%include file="metadata-edit.html" />