diff --git a/submodules/groups/groups.css b/submodules/groups/groups.css
index a9e5f8c..89b5368 100644
--- a/submodules/groups/groups.css
+++ b/submodules/groups/groups.css
@@ -248,33 +248,6 @@
#groups_container .detail-group .groups-fields:after {
clear: right;
}
-#groups_container .detail-group .add-user-dropdown {
- margin: 0;
- list-style: none;
-}
-#groups_container .detail-group .add-user-dropdown .dropdown {
- height: 30px;
- line-height: 30px;
-}
-#groups_container .detail-group .add-user-dropdown .dropdown-menu {
- padding: 0;
- border-radius: 0;
-}
-#groups_container .detail-group .add-user-dropdown .add-user {
- padding: 0px 15px;
- height: 40px;
- background: #FFF;
- white-space: nowrap;
- font-size: 14px;
- line-height: 40px;
- cursor: pointer;
-}
-#groups_container .detail-group .add-user-dropdown .add-user.in-use {
- display: none;
-}
-#groups_container .detail-group .add-user-dropdown .add-user:hover {
- background: #FCFCFC;
-}
/* Name */
.detail-group #form-name {
diff --git a/submodules/groups/groups.js b/submodules/groups/groups.js
index ab3aa90..dea88b4 100644
--- a/submodules/groups/groups.js
+++ b/submodules/groups/groups.js
@@ -1183,23 +1183,35 @@ define(function(require){
});
});
- template.on('click', '.add-user', function() {
- var $this = $(this),
- newEndpoint = {
- id: $this.data('id'),
- timeout: 20,
- delay: 0,
- endpoint_type: 'user',
- name: $(this).text()
- };
+ template.on('click', '.add-user-link', function() {
+ var usersInUse = $.map(template.find('.grid-time-row[data-id]'), function(val) {
+ return $(val).data('id');
+ }),
+ remainingUsers = _.filter(data.users, function(val) {
+ return usersInUse.indexOf(val.id) === -1;
+ });
- monster.pub('common.ringingDurationControl.addEndpoint', {
- container: template.find('.members-container'),
- endpoint: newEndpoint,
- hasRemoveColumn: true
+ monster.pub('common.monsterListing.render', {
+ dataList: remainingUsers,
+ dataType: 'users',
+ okCallback: function(users) {
+ _.each(users, function(user) {
+ var newEndpoint = {
+ id: user.id,
+ timeout: 20,
+ delay: 0,
+ endpoint_type: 'user',
+ name: user.name
+ };
+
+ monster.pub('common.ringingDurationControl.addEndpoint', {
+ container: template.find('.members-container'),
+ endpoint: newEndpoint,
+ hasRemoveColumn: true
+ });
+ });
+ }
});
-
- $this.addClass('in-use');
});
},
diff --git a/views/groups-members.html b/views/groups-members.html
index f1c80df..7019dbb 100644
--- a/views/groups-members.html
+++ b/views/groups-members.html
@@ -3,19 +3,10 @@