openstack
/
fuel-web
Code Issues Proposed changes

Merge "Rename role 'kvm-virt' to 'virt' in UI"

This commit is contained in:
Jenkins 2015-07-15 15:36:45 +00:00 committed by Gerrit Code Review
parent 929a6f1f1e c47975a56e
commit dee4e31d03
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nailgun/static/views/cluster_page.jsx
View File

@ -398,7 +398,7 @@ function($, _, i18n, Backbone, React, utils, models, dispatcher, componentMixins
stoppableTask = !_.contains(['stop_deployment', 'reset_environment', 'update', 'spawn_vms'], taskName),
isDeploymentImpossible = cluster.get('release').get('state') == 'unavailable' || (!cluster.get('nodes').hasChanges() && !cluster.needsRedeployment()),
isVMsProvisioningAvailable = cluster.get('nodes').any(function(node) {
return node.get('pending_addition') && node.hasRole('kvm-virt');
return node.get('pending_addition') && node.hasRole('virt');
});
return (
<div className='col-xs-6 col-md-3'>

4
nailgun/static/views/dialogs.jsx
View File

@ -437,7 +437,7 @@ function($, _, i18n, Backbone, React, utils, models, dispatcher, controls, compo
},
renderBody: function() {
var vmsCount = this.props.cluster.get('nodes').where(function(node) {
return node.get('pending_addition') && node.hasRole('kvm-virt');
return node.get('pending_addition') && node.hasRole('virt');
}).length;
return i18n('dialog.provision_vms.text', {count: vmsCount});
},
@ -733,7 +733,7 @@ function($, _, i18n, Backbone, React, utils, models, dispatcher, controls, compo
componentDidMount: function() {
this.assignAccordionEvents();
this.setDialogTitle();
if (this.props.node.get('pending_addition') && this.props.node.hasRole('kvm-virt')) {
if (this.props.node.get('pending_addition') && this.props.node.hasRole('virt')) {
var VMsConfModel = new models.BaseModel();
VMsConfModel.url = _.result(this.props.node, 'url') + '/vms_conf';
this.setProps({VMsConfModel: VMsConfModel});