You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2014/12/09 00:03:42 UTC
ambari git commit: AMBARI-8596. Global Notifications should be added
to newly created groups at once.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk e7b8383b5 -> bca33177d
AMBARI-8596. Global Notifications should be added to newly created groups at once.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bca33177
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bca33177
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bca33177
Branch: refs/heads/trunk
Commit: bca33177dd129d341e5df4cb338b5a413cee76ea
Parents: e7b8383
Author: Xi Wang <xi...@apache.org>
Authored: Mon Dec 8 14:48:29 2014 -0800
Committer: Xi Wang <xi...@apache.org>
Committed: Mon Dec 8 14:48:38 2014 -0800
----------------------------------------------------------------------
.../app/controllers/main/alerts/manage_alert_groups_controller.js | 3 ++-
ambari-web/app/styles/common.less | 2 ++
ambari-web/app/views/common/editable_list.js | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/bca33177/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 d69c9e2..58f50e9 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
@@ -102,6 +102,7 @@ App.ManageAlertGroupsController = Em.Controller.extend({
});
}
this.set('alertNotifications', alertNotifications);
+ this.set('alertGlobalNotifications', alertNotifications.filterProperty('global'));
},
onLoadAlertNotificationsError: function () {
@@ -666,7 +667,7 @@ App.ManageAlertGroupsController = Em.Controller.extend({
var newAlertGroup = App.AlertGroupComplex.create({
name: this.get('alertGroupName').trim(),
definitions: [],
- notifications: []
+ notifications: self.get('alertGlobalNotifications')
});
self.get('alertGroups').pushObject(newAlertGroup);
self.set('selectedAlertGroup', newAlertGroup);
http://git-wip-us.apache.org/repos/asf/ambari/blob/bca33177/ambari-web/app/styles/common.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/common.less b/ambari-web/app/styles/common.less
index afa1405..406eaf0 100644
--- a/ambari-web/app/styles/common.less
+++ b/ambari-web/app/styles/common.less
@@ -110,6 +110,8 @@
border: 1px solid #ebebeb;
z-index: 1000;
min-width: 65px;
+ max-height: 150px;
+ overflow: auto;
}
.typeahead-box ul{
list-style-type: none;
http://git-wip-us.apache.org/repos/asf/ambari/blob/bca33177/ambari-web/app/views/common/editable_list.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/editable_list.js b/ambari-web/app/views/common/editable_list.js
index abf57a9..3f139f8 100644
--- a/ambari-web/app/views/common/editable_list.js
+++ b/ambari-web/app/views/common/editable_list.js
@@ -108,7 +108,7 @@ App.EditableList = Ember.View.extend({
} else {
// Load typeahed items based on current input
var items = self.get('availableItemsToAdd');
- self.set('typeahead', items.slice(0, 5));
+ self.set('typeahead', items);
self.set('selectedTypeahed', 0);
}
} else {