From 9b6a4deb81a0224e9d773f1db67b09bc5848d30b Mon Sep 17 00:00:00 2001 From: ntymtsiv Date: Mon, 19 Sep 2016 15:59:26 +0300 Subject: [PATCH] Allow disabling DPDK option for bonds in any case. Change-Id: I1de32c443c83ad6f54562974cd3ddda38e0e6ac4 Closes-Bug: #1570782 --- .../nodes_tab_screens/edit_node_interfaces_screen.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/static/views/cluster_page_tabs/nodes_tab_screens/edit_node_interfaces_screen.js b/static/views/cluster_page_tabs/nodes_tab_screens/edit_node_interfaces_screen.js index 0d3405d23..6afe57bff 100644 --- a/static/views/cluster_page_tabs/nodes_tab_screens/edit_node_interfaces_screen.js +++ b/static/views/cluster_page_tabs/nodes_tab_screens/edit_node_interfaces_screen.js @@ -1610,6 +1610,7 @@ var NodeInterfaceAttributes = React.createClass({ ) : null; + var cantBeEnabled = isBond && !currentDPDKValue && !newBondType; return (
{i18n(ns + 'dpdk_description')}
@@ -1620,10 +1621,10 @@ var NodeInterfaceAttributes = React.createClass({ name='dpdk.enabled' onChange={(propertyName, propertyValue) => { this.onInterfacePropertiesChange('dpdk.enabled', propertyValue); - if (isBond) this.changeBondType(newBondType); + if (isBond && newBondType) this.changeBondType(newBondType); }} - disabled={this.props.locked || isBond && !newBondType} - tooltipText={isBond && !newBondType && i18n(ns + 'locked_dpdk_bond')} + disabled={this.props.locked || cantBeEnabled} + tooltipText={cantBeEnabled && i18n(ns + 'locked_dpdk_bond')} wrapperClassName='dpdk-control' error={errors && errors.common} />