mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #15149 from owncloud/fix-enable-for-group 

Correctly get array of groups and send OCP\IGroup objects to enable meth...
This commit is contained in:
Joas Schilling 2015-03-24 13:50:56 +01:00
parent 302c19067a b262c30fa9
commit 5e71d1558a
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/private/app.php
View File

@ -269,7 +269,15 @@ class OC_App {
$appManager = \OC::$server->getAppManager();
if (!is_null($groups)) {
$appManager->enableAppForGroups($app, $groups);
$groupManager = \OC::$server->getGroupManager();
$groupsList = [];
foreach ($groups as $group) {
$groupItem = $groupManager->get($group);
if ($groupItem instanceof \OCP\IGroup) {
$groupsList[] = $groupManager->get($group);
}
}
$appManager->enableAppForGroups($app, $groupsList);
} else {
$appManager->enableApp($app);
}

2
settings/js/apps.js
View File

@ -413,7 +413,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
var element = $(this).parent().find('input.enable');
var groups = $(this).val();
if (groups && groups !== '') {
groups = groups.split(',');
groups = groups.split('|');
} else {
groups = [];
}