Browse Source

Fixed api tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
tags/v14.0.0beta1
John Molakvoæ (skjnldsv) 6 years ago
parent
commit
23a1553539
No account linked to committer's email address
2 changed files with 7 additions and 7 deletions
  1. 4
    3
      apps/provisioning_api/lib/Controller/UsersController.php
  2. 3
    4
      settings/js/apps.js

+ 4
- 3
apps/provisioning_api/lib/Controller/UsersController.php View File

@@ -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) {

+ 3
- 4
settings/js/apps.js View File

@@ -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});
}
}


Loading…
Cancel
Save