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 <[email protected]> Authored: Tue Jan 6 13:07:58 2015 -0800 Committer: Xi Wang <[email protected]> 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); }); });
