From 4a2818b49ea5d673aa36c272873756d9234a82e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Thu, 8 Mar 2018 17:09:29 +0100 Subject: [PATCH] Fixed api tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/provisioning_api/lib/Controller/UsersController.php | 7 ++++--- 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 60b8393e1e4f7..087e65a1bcac5 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -790,9 +790,10 @@ public function getUserSubAdminGroups(string $userId): DataResponse { } // 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 b0cc1a11a2ff1..52d8beccae742 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}); } }