Ver código fonte

AMBARI-11638. Configs: Different values in warnings tooltip when config is in raw mode. (Richard Zang via yusaku)

Yusaku Sako 10 anos atrás
pai
commit
aac067e52c

+ 1 - 1
ambari-web/app/views/common/configs/widgets/config_widget_view.js

@@ -432,8 +432,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' : ''
     });
   }

+ 2 - 0
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;
         }

+ 1 - 1
ambari-web/test/views/common/configs/widgets/slider_config_widget_view_test.js

@@ -375,7 +375,7 @@ describe('App.SliderConfigWidgetView', function () {
 
     beforeEach(function() {
       viewInt.set('config', {});
-      stackConfigProperty = App.StackConfigProperty.createRecord({name: 'p1', valueAttributes: {minimum: 1, maximum: 10, increment_step: 4, type: 'int'}});
+      stackConfigProperty = App.StackConfigProperty.createRecord({name: 'p1', widget: { units: [ { 'unit-name': "int"}]}, valueAttributes: {minimum: 1, maximum: 10, increment_step: 4, type: 'int'}});
       viewInt.set('config.stackConfigProperty', stackConfigProperty);
       viewInt.set('config.isValid', true);
     });