summaryrefslogtreecommitdiffstats
path: root/settings/js/users
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2014-07-09 12:19:50 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2014-07-14 21:26:37 +0200
commitab2c7e06a4ea3c751058b6b72dc9b8832836669a (patch)
tree709a7a31a74be44d08dc038b3169f1cb4144a4d5 /settings/js/users
parent9ee1c7ff7143c9d75a5f5a9f9477cc73f5d97717 (diff)
downloadnextcloud-server-ab2c7e06a4ea3c751058b6b72dc9b8832836669a.tar.gz
nextcloud-server-ab2c7e06a4ea3c751058b6b72dc9b8832836669a.zip
remove dead code
do not filter groups. but update the user count according to the filter improve phpdoc improve metadata runtime cache add metadata tests
Diffstat (limited to 'settings/js/users')
-rw-r--r--settings/js/users/filter.js6
-rw-r--r--settings/js/users/groups.js5
2 files changed, 9 insertions, 2 deletions
diff --git a/settings/js/users/filter.js b/settings/js/users/filter.js
index 1f7a29de0c9..c5944e9b4b1 100644
--- a/settings/js/users/filter.js
+++ b/settings/js/users/filter.js
@@ -14,6 +14,7 @@ function UserManagementFilter(filterInput, userList, groupList) {
this.filterInput = filterInput;
this.userList = userList;
this.groupList = groupList;
+ this.filterGroups = false;
this.thread = undefined;
this.oldval = this.filterInput.val();
@@ -55,7 +56,10 @@ UserManagementFilter.prototype.init = function() {
UserManagementFilter.prototype.run = _.debounce(function() {
this.userList.empty();
this.userList.update(GroupList.getCurrentGID());
- this.groupList.empty();
+ if(this.filterGroups) {
+ // user counts are being updated nevertheless
+ this.groupList.empty();
+ }
this.groupList.update();
},
300
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 22f5c9d2a72..b4cf73c59f2 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -114,7 +114,10 @@ GroupList = {
GroupList.updating = true;
$.get(
OC.generateUrl('/settings/ajax/grouplist'),
- {pattern: filter.getPattern()},
+ {
+ pattern: filter.getPattern(),
+ filterGroups: filter.filterGroups ? 1 : 0
+ },
function (result) {
var lis = [];