You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2015/06/07 05:42:48 UTC
ambari git commit: Revert "AMBARI-11638. Configs: Different values in
warnings tooltip when config is in raw mode. (Richard Zang via srimanth)"
Repository: ambari
Updated Branches:
refs/heads/trunk ecfc8b632 -> 9127e1987
Revert "AMBARI-11638. Configs: Different values in warnings tooltip when config is in raw mode. (Richard Zang via srimanth)"
This reverts commit b1e1a131f67b879e20401ba4d8dc5fd38eb24f54.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9127e198
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9127e198
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9127e198
Branch: refs/heads/trunk
Commit: 9127e198720d9b436e666bad9ae4e6073e036647
Parents: ecfc8b6
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Sat Jun 6 20:36:20 2015 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Sat Jun 6 20:36:20 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, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9127e198/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 e13d3d3..86792be 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,8 +431,9 @@ App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo
*/
updateWarningsForCompatibilityWithWidget: function (message) {
this.setProperties({
- 'config.warnMessage': message,
+ warnMessage: message,
issueMessage: message,
+ iconClass: message ? 'warning' : '',
configLabelClass: message ? 'text-warning' : ''
});
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/9127e198/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 6f6b9e3..46a0657 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,7 +525,6 @@ 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;
}
@@ -533,7 +532,6 @@ 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;
}