summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2015-10-02 10:34:57 +0200
committerJörn Friedrich Dreyer <jfd@butonic.de>2015-10-02 10:34:57 +0200
commitaaabe356b59b32a384514c5f8940119d9760cc6f (patch)
tree9b32dccd7c62ad801b4a05b4f4f97ab1e55d97f8
parent3dec30d0e09128002f24f58b7ea042c42defce31 (diff)
parent3ce45863ab646b312ad04b25fa9670bedb08497b (diff)
downloadnextcloud-server-aaabe356b59b32a384514c5f8940119d9760cc6f.tar.gz
nextcloud-server-aaabe356b59b32a384514c5f8940119d9760cc6f.zip
Merge pull request #19520 from owncloud/issue-17420-modify-group-count-when-changing-memberships
Modify the group user count when changing membership of a user
-rw-r--r--settings/js/users/groups.js16
-rw-r--r--settings/js/users/users.js5
2 files changed, 17 insertions, 4 deletions
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 322db6c1b45..c8d2ef7c5b1 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -49,18 +49,26 @@ GroupList = {
return parseInt($groupLiElement.data('usercount'), 10);
},
- modEveryoneCount: function(diff) {
- var $li = GroupList.getGroupLI(GroupList.everyoneGID);
+ modGroupCount: function(gid, diff) {
+ var $li = GroupList.getGroupLI(gid);
var count = GroupList.getUserCount($li) + diff;
GroupList.setUserCount($li, count);
},
incEveryoneCount: function() {
- GroupList.modEveryoneCount(1);
+ GroupList.modGroupCount(GroupList.everyoneGID, 1);
},
decEveryoneCount: function() {
- GroupList.modEveryoneCount(-1);
+ GroupList.modGroupCount(GroupList.everyoneGID, -1);
+ },
+
+ incGroupCount: function(gid) {
+ GroupList.modGroupCount(gid, 1);
+ },
+
+ decGroupCount: function(gid) {
+ GroupList.modGroupCount(gid, -1);
},
getCurrentGID: function () {
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 47d63c11b95..519fe9655db 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -470,6 +470,11 @@ var UserList = {
UserList.availableGroups.push(groupName);
}
+ if (response.data.action === 'add') {
+ GroupList.incGroupCount(groupName);
+ } else {
+ GroupList.decGroupCount(groupName);
+ }
}
if (response.data.message) {
OC.Notification.show(response.data.message);