openstack
/
fuel-web
Code Issues Proposed changes

Merge "Fix invalid icon for "Other" section on Networks tab"

This commit is contained in:
Jenkins 2015-12-07 17:50:57 +00:00 committed by Gerrit Code Review
parent ac46ede89f 03a0003eab
commit 218e8a2ab3
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nailgun/static/tests/functional/test_cluster_network.js
View File

@ -310,6 +310,13 @@ define([
.setInputValue('.public input[name=range-start_ip_ranges]', 'blablabla')
.assertElementAppears('.public .has-error input[name=range-start_ip_ranges]', 1000,
'Error class is applied for invalid range start');
},
'Other settings validation error': function() {
return this.remote
.clickByCssSelector('.subtab-link-network_settings')
.setInputValue('input[name=dns_list]', 'blablabla')
.assertElementAppears('.subtab-link-network_settings .glyphicon-danger-sign', 1000,
'Warning icon for "Other" section appears');
}
};
});

7
nailgun/static/views/cluster_page_tabs/network_tab.js
View File

@ -1063,6 +1063,13 @@ function($, _, i18n, Backbone, React, models, dispatcher, utils, dialogs, compon
isInvalid = !!_.intersection(NetworkingL3Parameters.renderedParameters, _.keys(networkParametersErrors)).length;
} else if (groupName == 'nova_configuration') {
isInvalid = !!_.intersection(NovaParameters.renderedParameters, _.keys(networkParametersErrors)).length;
} else if (groupName == 'network_settings') {
var settings = cluster.get('settings');
isInvalid = _.any(_.keys(settings.validationError), (settingPath) => {
var settingSection = settingPath.split('.')[0];
return settings.get(settingSection).metadata.group == 'network' ||
settings.get(settingPath).group == 'network';
});
}
if (isNetworkGroupPill) {