You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2015/06/06 18:45:04 UTC
ambari git commit: AMBARI-11638. Configs: Different values in
warnings tooltip when config is in raw mode. (Richard Zang via srimanth)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 49e6ed3c0 -> 70aba6b95
AMBARI-11638. Configs: Different values in warnings tooltip when config is in raw mode. (Richard Zang via srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/70aba6b9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/70aba6b9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/70aba6b9
Branch: refs/heads/branch-2.1
Commit: 70aba6b951225421a255a76fb6375bf57646d97c
Parents: 49e6ed3
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Sat Jun 6 09:44:27 2015 -0700
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Sat Jun 6 09:44:27 2015 -0700
----------------------------------------------------------------------
ambari-web/app/views/common/configs/widgets/config_widget_view.js | 3 +--
.../app/views/common/configs/widgets/slider_config_widget_view.js | 2 ++
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/70aba6b9/ambari-web/app/views/common/configs/widgets/config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/config_widget_view.js b/ambari-web/app/views/common/configs/widgets/config_widget_view.js
index 86792be..e13d3d3 100644
--- a/ambari-web/app/views/common/configs/widgets/config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/config_widget_view.js
@@ -431,9 +431,8 @@ App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo
*/
updateWarningsForCompatibilityWithWidget: function (message) {
this.setProperties({
- warnMessage: message,
+ 'config.warnMessage': message,
issueMessage: message,
- iconClass: message ? 'warning' : '',
configLabelClass: message ? 'text-warning' : ''
});
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/70aba6b9/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 46a0657..6f6b9e3 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
@@ -525,6 +525,7 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
if (this.get('config.stackConfigProperty.valueAttributes.minimum')) {
var min = this.get('parseFunction')(this.get('config.stackConfigProperty.valueAttributes.minimum'));
if (configValue < min) {
+ min = this.widgetValueByConfigAttributes(min);
this.updateWarningsForCompatibilityWithWidget(Em.I18n.t('config.warnMessage.outOfBoundaries.less').format(min + this.get('unitLabel')));
return false;
}
@@ -532,6 +533,7 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
if (this.get('config.stackConfigProperty.valueAttributes.maximum')) {
var max = this.get('parseFunction')(this.get('config.stackConfigProperty.valueAttributes.maximum'));
if (configValue > max) {
+ max = this.widgetValueByConfigAttributes(max);
this.updateWarningsForCompatibilityWithWidget(Em.I18n.t('config.warnMessage.outOfBoundaries.greater').format(max + this.get('unitLabel')));
return false;
}