summaryrefslogtreecommitdiffstats
path: root/settings/js/users/groups.js
diff options
context:
space:
mode:
Diffstat (limited to 'settings/js/users/groups.js')
-rw-r--r--settings/js/users/groups.js17
1 files changed, 15 insertions, 2 deletions
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index aac1609bce7..b54f26b4ccb 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -48,7 +48,8 @@ GroupList = {
},
getUserCount: function ($groupLiElement) {
- return parseInt($groupLiElement.data('usercount'), 10);
+ var count = parseInt($groupLiElement.data('usercount'), 10);
+ return isNaN(count) ? 0 : count;
},
modGroupCount: function(gid, diff) {
@@ -208,10 +209,17 @@ GroupList = {
},
+ showDisabledUsers: function () {
+ UserList.empty();
+ UserList.update('disabledUsers');
+ $userGroupList.find('li').removeClass('active');
+ GroupList.getGroupLI('disabledUsers').addClass('active');
+ },
+
showGroup: function (gid) {
GroupList.activeGID = gid;
UserList.empty();
- UserList.update(gid);
+ UserList.update(gid === '_everyone' ? '' : gid);
$userGroupList.find('li').removeClass('active');
if (gid !== undefined) {
//TODO: treat Everyone properly
@@ -364,6 +372,11 @@ $(document).ready( function () {
GroupList.showGroup(GroupList.getElementGID(this));
});
+ // show disabled users
+ $userGroupList.on('click', '.disabledusers', function () {
+ GroupList.showDisabledUsers();
+ });
+
$('#newgroupname').on('input', function(){
GroupList.handleAddGroupInput(this.value);
});