浏览代码

AMBARI-15038 Alert definitions: Percentage params get validation errors when they shouldn't (Joe Wang via rzang)

Richard Zang 9 年之前
父节点
当前提交
f18601c7c7
共有 2 个文件被更改,包括 6 次插入6 次删除
  1. 2 2
      ambari-web/app/models/alerts/alert_config.js
  2. 4 4
      ambari-web/test/models/alerts/alert_config_test.js

+ 2 - 2
ambari-web/app/models/alerts/alert_config.js

@@ -532,7 +532,7 @@ App.AlertConfigProperties.Parameters = {
       value = String(value).trim();
       value = String(value).trim();
       value = parseFloat(value);
       value = parseFloat(value);
 
 
-      return !isNaN(value) && value > 0 && value <= 100;
+      return !isNaN(value) && value > 0;
     }.property('value')
     }.property('value')
   })
   })
 
 
@@ -622,7 +622,7 @@ App.AlertConfigProperties.Thresholds = {
         return false;
         return false;
       }
       }
 
 
-      return this.get('showInputForValue') ? !isNaN(value) && value > 0 && value <= 100 : true;
+      return this.get('showInputForValue') ? !isNaN(value) && value > 0 : true;
     }.property('displayValue', 'showInputForValue'),
     }.property('displayValue', 'showInputForValue'),
 
 
     /**
     /**

+ 4 - 4
ambari-web/test/models/alerts/alert_config_test.js

@@ -104,13 +104,13 @@ describe('App.AlertConfigProperties', function () {
           {value: 'abc', expected: false},
           {value: 'abc', expected: false},
           {value: 'g1', expected: false},
           {value: 'g1', expected: false},
           {value: '1g', expected: false},
           {value: '1g', expected: false},
-          {value: '123', expected: false},
+          {value: '123', expected: true},
           {value: '23', expected: true},
           {value: '23', expected: true},
-          {value: '123.8', expected: false},
+          {value: '123.8', expected: true},
           {value: '5.8', expected: true},
           {value: '5.8', expected: true},
-          {value: 123, expected: false},
+          {value: 123, expected: true},
           {value: 23, expected: true},
           {value: 23, expected: true},
-          {value: 123.8, expected: false},
+          {value: 123.8, expected: true},
           {value: 5.8, expected: true}
           {value: 5.8, expected: true}
         ]).forEach(function (test) {
         ]).forEach(function (test) {
           it('value: ' + JSON.stringify(test.value) + ' ;result - ' + test.expected, function () {
           it('value: ' + JSON.stringify(test.value) + ' ;result - ' + test.expected, function () {