Skip to content

Commit

Permalink
Fixed api tests
Browse files Browse the repository at this point in the history
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
  • Loading branch information
skjnldsv committed Mar 8, 2018
1 parent f7fe777 commit 4a2818b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
7 changes: 4 additions & 3 deletions apps/provisioning_api/lib/Controller/UsersController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 3 additions & 4 deletions settings/js/apps.js
Original file line number Diff line number Diff line change
Expand Up @@ -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});
}
}

Expand Down

0 comments on commit 4a2818b

Please sign in to comment.