stick with current group when the filter is used

diff --git a/settings/js/users/filter.js b/settings/js/users/filter.js
index 3b04a8750cff77fda5dcb31d13beccb9da745487..456c51376b907b90ca1c784e221ad7a4bd3fce44 100644 (file)
--- a/settings/js/users/filter.js
+++ b/settings/js/users/filter.js
@@ -59,7 +59,7 @@ UserManagementFilter.prototype.init = function() {
  */
 UserManagementFilter.prototype.run = function() {
        this.userList.empty();
-       this.userList.update();
+       this.userList.update(GroupList.getCurrentGID());
        this.groupList.empty();
        this.groupList.update();
 };

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 4c555bd4c86657db8693c15e80fa7fb233d55830..e62dfd9dff73ee03c82e7a93affba66392d4e005 100644 (file)
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -6,6 +6,8 @@
  */
 
  var GroupList = {
+       activeGID: '',
+
        addGroup: function(gid, usercount) {
                var li = $('li[data-gid]').last().clone();
                var ul = $('li[data-gid]').first().parent();
@@ -28,6 +30,10 @@
                groupLiElement.find('span[class=usercount]').first().text(usercount);
        },
 
+       getCurrentGID: function() {
+               return GroupList.activeGID;
+       },
+
        sortGroups: function(usercount) {
                var lis = $('li[data-gid]').filterAttr('data-usercount', usercount.toString()).get();
                var ul = $(lis).first().parent();
@@ -135,6 +141,7 @@
        },
 
        showGroup: function (gid) {
+               GroupList.activeGID = gid;
                UserList.empty();
                UserList.update(gid);
                $('#app-navigation li').removeClass('active');