Browse Source

UI-1446: Migrated vm to email field

4.3
Jean-Roch Maitre 11 years ago
parent
commit
6cd0b07c54
1 changed files with 20 additions and 3 deletions
  1. +20
    -3
      submodules/vmboxes/vmboxes.js

+ 20
- 3
submodules/vmboxes/vmboxes.js View File

@ -91,9 +91,21 @@ define(function(require){
var self = this;
self.vmboxesGetEditData(id, function(data) {
data = self.vmboxesMigrateData(data);
self.vmboxesRenderVmbox(data, callback);
});
},
vmboxesMigrateData: function(data) {
var self = this;
if(data.hasOwnProperty('notify_email_address')) {
data.notify_email_addresses = data.notify_email_address;
}
return data;
},
vmboxesRenderVmbox: function(data, callback) {
var self = this
@ -116,7 +128,7 @@ define(function(require){
}
};
_.each(data.notify_email_address, function(recipient) {
_.each(data.notify_email_addresses, function(recipient) {
templateVMBox.find('.saved-entities')
.append(monster.template(self, 'vmboxes-emailRow', { name: recipient }));
});
@ -227,9 +239,9 @@ define(function(require){
mergedData = $.extend(true, {}, originalData, formData);
// Rebuild list of recipients from UI
mergedData.notify_email_address = [];
mergedData.notify_email_addresses = [];
template.find('.saved-entities .entity-wrapper').each(function() {
mergedData.notify_email_address.push($(this).data('name'));
mergedData.notify_email_addresses.push($(this).data('name'));
});
mergedData.not_configurable = !formData.extra.configurable;
@ -238,6 +250,11 @@ define(function(require){
delete mergedData.pin;
}
// Delete data that is obsolete (migrated to notify_email_addresses)
if(mergedData.hasOwnProperty('notify_email_address')) {
delete mergedData.notify_email_address;
}
delete mergedData.extra;
return mergedData;


Loading…
Cancel
Save