Repository: ambari Updated Branches: refs/heads/branch-2.1 5aa60e7b0 -> 520a601da
AMBARI-13030. Alerts are automatically added to newly created alert group if some alert group was chosen (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/520a601d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/520a601d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/520a601d Branch: refs/heads/branch-2.1 Commit: 520a601da227ed4b503849b506a2b6e1e5ce16e2 Parents: 5aa60e7 Author: Alex Antonenko <[email protected]> Authored: Tue Sep 8 16:28:53 2015 +0300 Committer: Alex Antonenko <[email protected]> Committed: Tue Sep 8 16:29:01 2015 +0300 ---------------------------------------------------------------------- .../app/controllers/main/alerts/manage_alert_groups_controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/520a601d/ambari-web/app/controllers/main/alerts/manage_alert_groups_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/alerts/manage_alert_groups_controller.js b/ambari-web/app/controllers/main/alerts/manage_alert_groups_controller.js index b2b52ea..e956a9e 100644 --- a/ambari-web/app/controllers/main/alerts/manage_alert_groups_controller.js +++ b/ambari-web/app/controllers/main/alerts/manage_alert_groups_controller.js @@ -757,7 +757,7 @@ App.ManageAlertGroupsController = Em.Controller.extend({ label: function () { return this.get('displayName') + ' (' + this.get('definitions.length') + ')'; }.property('displayName', 'definitions.length'), - definitions: self.get('selectedAlertGroup.definitions').slice(0), + definitions: duplicated ? self.get('selectedAlertGroup.definitions').slice(0) : [], notifications: self.get('alertGlobalNotifications'), isAddDefinitionsDisabled: false });
