Merge "Rename role 'kvm-virt' to 'virt' in UI"
This commit is contained in:
commit
dee4e31d03
@ -398,7 +398,7 @@ function($, _, i18n, Backbone, React, utils, models, dispatcher, componentMixins
|
|||||||
stoppableTask = !_.contains(['stop_deployment', 'reset_environment', 'update', 'spawn_vms'], taskName),
|
stoppableTask = !_.contains(['stop_deployment', 'reset_environment', 'update', 'spawn_vms'], taskName),
|
||||||
isDeploymentImpossible = cluster.get('release').get('state') == 'unavailable' || (!cluster.get('nodes').hasChanges() && !cluster.needsRedeployment()),
|
isDeploymentImpossible = cluster.get('release').get('state') == 'unavailable' || (!cluster.get('nodes').hasChanges() && !cluster.needsRedeployment()),
|
||||||
isVMsProvisioningAvailable = cluster.get('nodes').any(function(node) {
|
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 (
|
return (
|
||||||
<div className='col-xs-6 col-md-3'>
|
<div className='col-xs-6 col-md-3'>
|
||||||
|
@ -437,7 +437,7 @@ function($, _, i18n, Backbone, React, utils, models, dispatcher, controls, compo
|
|||||||
},
|
},
|
||||||
renderBody: function() {
|
renderBody: function() {
|
||||||
var vmsCount = this.props.cluster.get('nodes').where(function(node) {
|
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;
|
}).length;
|
||||||
return i18n('dialog.provision_vms.text', {count: vmsCount});
|
return i18n('dialog.provision_vms.text', {count: vmsCount});
|
||||||
},
|
},
|
||||||
@ -733,7 +733,7 @@ function($, _, i18n, Backbone, React, utils, models, dispatcher, controls, compo
|
|||||||
componentDidMount: function() {
|
componentDidMount: function() {
|
||||||
this.assignAccordionEvents();
|
this.assignAccordionEvents();
|
||||||
this.setDialogTitle();
|
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();
|
var VMsConfModel = new models.BaseModel();
|
||||||
VMsConfModel.url = _.result(this.props.node, 'url') + '/vms_conf';
|
VMsConfModel.url = _.result(this.props.node, 'url') + '/vms_conf';
|
||||||
this.setProps({VMsConfModel: VMsConfModel});
|
this.setProps({VMsConfModel: VMsConfModel});
|
||||||
|
Loading…
Reference in New Issue
Block a user