summaryrefslogtreecommitdiffstats
path: root/settings/ajax/grouplist.php
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2014-07-09 12:19:50 +0200
committerArthur Schiwon <blizzz@owncloud.com>2014-07-15 08:31:43 +0200
commit334ace90802a224f60e9dfb942e4581739ddd3c2 (patch)
tree9daad4358aec60e14b5c5ef616456e642e70bfdf /settings/ajax/grouplist.php
parent8ec00dcb6604b395620efb7b36ac36a47b90d2c5 (diff)
downloadnextcloud-server-334ace90802a224f60e9dfb942e4581739ddd3c2.tar.gz
nextcloud-server-334ace90802a224f60e9dfb942e4581739ddd3c2.zip
Backport of #9562
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 fixing PHPDoc
Diffstat (limited to 'settings/ajax/grouplist.php')
-rw-r--r--settings/ajax/grouplist.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/settings/ajax/grouplist.php b/settings/ajax/grouplist.php
index 91700adc359..52df98c4e5e 100644
--- a/settings/ajax/grouplist.php
+++ b/settings/ajax/grouplist.php
@@ -27,6 +27,12 @@ if (isset($_GET['pattern']) && !empty($_GET['pattern'])) {
} else {
$pattern = '';
}
+if (isset($_GET['filterGroups']) && !empty($_GET['filterGroups'])) {
+ $filterGroups = intval($_GET['filterGroups']) === 1;
+} else {
+ $filterGroups = false;
+}
+$groupPattern = $filterGroups ? $pattern : '';
$groups = array();
$adminGroups = array();
$groupManager = \OC_Group::getManager();
@@ -36,13 +42,7 @@ $isAdmin = OC_User::isAdminUser(OC_User::getUser());
//groups will be filtered out later
$groupsInfo = new \OC\Group\MetaData(OC_User::getUser(), true, $groupManager);
$groupsInfo->setSorting($groupsInfo::SORT_USERCOUNT);
-list($adminGroups, $groups) = $groupsInfo->get($pattern);
-
-$accessibleGroups = $groupManager->search($pattern);
-if(!$isAdmin) {
- $subadminGroups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
- $accessibleGroups = array_intersect($groups, $subadminGroups);
-}
+list($adminGroups, $groups) = $groupsInfo->get($groupPattern, $pattern);
OC_JSON::success(
array('data' => array('adminGroups' => $adminGroups, 'groups' => $groups)));