diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-03-08 17:09:29 +0100 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-03-08 17:13:52 +0100 |
| commit | 23a1553539d67f7eb317abd3857640d056853d50 (patch) | |
| tree | 8206459f77b0de6e51fb04ce19ecf8d3f3404d80 | |
| parent | f1478ea4401fa28d4dc358aca9d0513853190d66 (diff) | |
| download | nextcloud-server-23a1553539d67f7eb317abd3857640d056853d50.tar.gz nextcloud-server-23a1553539d67f7eb317abd3857640d056853d50.zip | |
Fixed api tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| -rw-r--r-- | apps/provisioning_api/lib/Controller/UsersController.php | 7 | ||||
| -rw-r--r-- | settings/js/apps.js | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php index 60b8393e1e4..087e65a1bca 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -790,9 +790,10 @@ class UsersController extends OCSController { } // Get the subadmin groups - $groups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($user); - foreach ($groups as $key => $group) { - $groups[$key] = $group->getGID(); + $subAdminGroups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($user); + $groups = []; + foreach ($subAdminGroups as $key => $group) { + $groups[] = $group->getGID(); } if(!$groups) { diff --git a/settings/js/apps.js b/settings/js/apps.js index b0cc1a11a2f..52d8beccae7 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -641,14 +641,13 @@ OC.Settings.Apps = OC.Settings.Apps || { $('#navigation li[data-id=' + previousEntry.id + ']').after(li); // draw attention to the newly added app entry - // by flashing it twice + // by flashing twice the more apps menu if(addedApps[entry.id]) { - $('#header .menutoggle') + $('#header #more-apps') .animate({opacity: 0.5}) .animate({opacity: 1}) .animate({opacity: 0.5}) - .animate({opacity: 1}) - .animate({opacity: 0.75}); + .animate({opacity: 1}); } } |