Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C1F43187A2 for ; Fri, 18 Mar 2016 15:08:44 +0000 (UTC) Received: (qmail 1463 invoked by uid 500); 18 Mar 2016 15:08:44 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 1432 invoked by uid 500); 18 Mar 2016 15:08:44 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 1423 invoked by uid 99); 18 Mar 2016 15:08:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Mar 2016 15:08:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7D761DFA43; Fri, 18 Mar 2016 15:08:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alexantonenko@apache.org To: commits@ambari.apache.org Message-Id: <463d6be70fc14e1aae80b3f39d381a3f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-15481. Metrics Alert definitions not updated through Alerts UI (alexantonenko) Date: Fri, 18 Mar 2016 15:08:44 +0000 (UTC) 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 Authored: Fri Mar 18 17:08:27 2016 +0200 Committer: Alex Antonenko 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') })); });