openstack
/
fuel-ui
Code Issues Proposed changes

Support update of core settings of operational cluster 

Handle a difference between current and deployed
cluster settings structure.
UI should not crash if some settings were added after
cluster deployment.

Closes-Bug: #1617261

Change-Id: I8bd572c73b53f976ba0f56f24a82efae05ccff9b
This commit is contained in:
Julia Aranovich 2016-08-29 15:16:19 +03:00
parent 6b56454e26
commit 44f9983556
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
static/models.js
View File

@ -872,12 +872,12 @@ models.Settings = Backbone.DeepModel
},
hasChanges(datatoCheck, models) {
return _.any(this.attributes, (section, sectionName) => {
// plugins installed to already deployed environment
// settings (plugins) installed to already deployed environment
// are not presented in the environment deployed configuration
var sectionToCheck = datatoCheck[sectionName];
if (this.isPlugin(section) && !sectionToCheck) return section.metadata.enabled;
var {metadata} = section;
if (!sectionToCheck) return !metadata.toggleable || metadata.enabled;
var metadata = section.metadata;
if (metadata) {
if (!sectionToCheck.metadata) return false;
// restrictions with action = 'none' should not block checking of the setting section
@ -931,8 +931,6 @@ models.Settings = Backbone.DeepModel
* if not specified (default), update all settings
**/
this.validationError = null;
_.each(this.attributes, (section, sectionName) => {
var isNetworkGroup = section.metadata.group === 'network';
var shouldSectionBeUpdated = _.isUndefined(updateNetworkSettings) ||
@ -948,7 +946,7 @@ models.Settings = Backbone.DeepModel
);
this.mergePluginSettings(sectionName);
}
} else {
} else if (newSettings.get(sectionName)) {
_.each(section, (setting, settingName) => {
// do not update hidden settings (hack for #1442143)
var shouldSettingBeUpdated = setting.type !== 'hidden' && (