You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2017/05/05 15:06:27 UTC
ambari git commit: AMBARI-20941 UI Deploy: On enabling hive
interactive query,
value of 'Number of nodes used by Hive's LLAP' becomes invalid. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 3817ad5da -> 57359c930
AMBARI-20941 UI Deploy: On enabling hive interactive query, value of 'Number of nodes used by Hive's LLAP' becomes invalid. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/57359c93
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/57359c93
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/57359c93
Branch: refs/heads/trunk
Commit: 57359c930fb3efea0e319f208b6784e1377ba8f3
Parents: 3817ad5
Author: ababiichuk <ab...@hortonworks.com>
Authored: Fri May 5 17:35:03 2017 +0300
Committer: ababiichuk <ab...@hortonworks.com>
Committed: Fri May 5 17:38:36 2017 +0300
----------------------------------------------------------------------
.../configs/widgets/slider_config_widget_view.js | 11 ++++++++++-
.../configs/widgets/slider_config_widget_view_test.js | 13 +++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/57359c93/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
index 948af5d..5c8ea78 100644
--- a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
@@ -113,7 +113,8 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
var configValue = this.get('config.value');
var defaultGroupAttr = this.get('config.stackConfigProperty.valueAttributes');
var groupAttr = this.get('configGroup') && defaultGroupAttr[this.get('configGroup.name')];
- var boundary = (groupAttr && !Em.isNone(groupAttr[attribute])) ? groupAttr[attribute] : defaultGroupAttr[attribute];
+ var usedGroupAttr = (groupAttr && !Em.isNone(groupAttr[attribute])) ? groupAttr : defaultGroupAttr;
+ var boundary = usedGroupAttr[attribute];
if (!this.get('referToSelectedGroup')) {
if (attribute === 'minimum') {
@@ -126,6 +127,14 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
}
}
}
+ if (isNaN(boundary) && !isNaN(configValue)) {
+ if (attribute === 'minimum') {
+ return isNaN(usedGroupAttr['maximum']) ? configValue : Math.min(usedGroupAttr['maximum'], configValue).toString();
+ }
+ if (attribute === 'maximum') {
+ return isNaN(usedGroupAttr['minimum']) ? configValue : Math.max(usedGroupAttr['minimum'], configValue).toString();
+ }
+ }
return boundary;
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/57359c93/ambari-web/test/views/common/configs/widgets/slider_config_widget_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/common/configs/widgets/slider_config_widget_view_test.js b/ambari-web/test/views/common/configs/widgets/slider_config_widget_view_test.js
index 9817479..3be5b24 100644
--- a/ambari-web/test/views/common/configs/widgets/slider_config_widget_view_test.js
+++ b/ambari-web/test/views/common/configs/widgets/slider_config_widget_view_test.js
@@ -315,6 +315,19 @@ describe('App.SliderConfigWidgetView', function () {
viewInt.set('config.group', {name: 'group1'});
expect(viewInt.getValueAttributeByGroup('maximum')).to.equal('3072');
});
+
+ it('minimum is missing', function () {
+ viewInt.set('config.stackConfigProperty.valueAttributes.minimum', undefined);
+ expect(viewInt.getValueAttributeByGroup('minimum')).to.equal('486');
+ });
+
+ it('minimum is missing, value is invalid', function () {
+ viewInt.get('config').setProperties({
+ 'value': 3072,
+ 'stackConfigProperty.valueAttributes.minimum': undefined
+ });
+ expect(viewInt.getValueAttributeByGroup('minimum')).to.equal('2096');
+ });
});
describe('#initSlider', function() {