ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject ambari git commit: AMBARI-15481. Metrics Alert definitions not updated through Alerts UI (alexantonenko)
Date Fri, 18 Mar 2016 15:08:44 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk fa611afd2 -> a4d5a31bb


AMBARI-15481. Metrics Alert definitions not updated through Alerts UI (alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a4d5a31b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a4d5a31b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a4d5a31b

Branch: refs/heads/trunk
Commit: a4d5a31bb34dab85dc526e70c9ec8328f16bd3a2
Parents: fa611af
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Fri Mar 18 17:08:27 2016 +0200
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Fri Mar 18 17:08:39 2016 +0200

----------------------------------------------------------------------
 .../app/controllers/main/alerts/definition_configs_controller.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a4d5a31b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
index e9f6726..a927b59 100644
--- a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
+++ b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
@@ -128,7 +128,7 @@ App.MainAlertDefinitionConfigsController = Em.Controller.extend({
    */
   getThresholdsProperty: function (type, property) {
     var warning = this.get('content.reporting').findProperty('type', type);
-    return warning && warning.get(property) ? warning.get(property) : null;
+    return warning && !Ember.isEmpty(warning.get(property)) ? warning.get(property)
: null;
   },
 
   /**
@@ -346,7 +346,7 @@ App.MainAlertDefinitionConfigsController = Em.Controller.extend({
         label: isWizard ? '' : parameter.get('displayName'),
         threshold: isWizard ? '' : parameter.get('threshold'),
         units: isWizard ? '' : parameter.get('units'),
-        type: isWizard ? '' : parameter.get('type'),
+        type: isWizard ? '' : parameter.get('type')
       }));
     });
 


Mime
View raw message