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 94D95CB37 for ; Wed, 7 Jan 2015 21:05:44 +0000 (UTC) Received: (qmail 93315 invoked by uid 500); 7 Jan 2015 21:05:45 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 93220 invoked by uid 500); 7 Jan 2015 21:05:45 -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 93204 invoked by uid 99); 7 Jan 2015 21:05:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jan 2015 21:05:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 72DF69D2995; Wed, 7 Jan 2015 21:05:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: xiwang@apache.org To: commits@ambari.apache.org Date: Wed, 07 Jan 2015 21:05:46 -0000 Message-Id: <4c673973d224473487a689a88b57039e@git.apache.org> In-Reply-To: <98893fc200744b60ade865647f537816@git.apache.org> References: <98893fc200744b60ade865647f537816@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ambari git commit: AMBARI-9013. Alerts UI: type=aggregate should have interval as editable.(xiwang) AMBARI-9013. Alerts UI: type=aggregate should have interval as editable.(xiwang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f90ac9e6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f90ac9e6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f90ac9e6 Branch: refs/heads/trunk Commit: f90ac9e67eb5d2348b8e5ec5a13fd53090e11d7f Parents: 915f0e7 Author: Xi Wang Authored: Tue Jan 6 13:07:58 2015 -0800 Committer: Xi Wang Committed: Wed Jan 7 12:57:39 2015 -0800 ---------------------------------------------------------------------- .../app/controllers/main/alerts/definition_configs_controller.js | 3 +++ .../main/alerts/definitions_configs_controller_test.js | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f90ac9e6/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 264f6d1..ca29fdd 100644 --- a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js +++ b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js @@ -304,6 +304,9 @@ App.MainAlertDefinitionConfigsController = Em.Controller.extend({ App.AlertConfigProperties.Description.create({ value: isWizard ? '' : alertDefinition.get('description') }), + App.AlertConfigProperties.Interval.create({ + value: isWizard ? '' : alertDefinition.get('interval') + }), App.AlertConfigProperties.Thresholds.OkThreshold.create({ label: 'Thresholds', showInputForValue: false, http://git-wip-us.apache.org/repos/asf/ambari/blob/f90ac9e6/ambari-web/test/controllers/main/alerts/definitions_configs_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/alerts/definitions_configs_controller_test.js b/ambari-web/test/controllers/main/alerts/definitions_configs_controller_test.js index 0ea85e6..ac06de7 100644 --- a/ambari-web/test/controllers/main/alerts/definitions_configs_controller_test.js +++ b/ambari-web/test/controllers/main/alerts/definitions_configs_controller_test.js @@ -283,6 +283,7 @@ describe('App.MainAlertDefinitionConfigsController', function () { controller.set('content', Em.Object.create({ name: 'alertDefinitionName', description: 'alertDefinitionDescription', + interval: 60, reporting: [ Em.Object.create({ type: 'warning', @@ -301,7 +302,7 @@ describe('App.MainAlertDefinitionConfigsController', function () { var result = controller.renderAggregateConfigs(); - expect(result.length).to.equal(4); + expect(result.length).to.equal(5); }); });