diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2015-03-24 12:56:42 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2015-03-24 12:56:42 +0100 |
| commit | b262c30fa9780290ecd0411cee2c4da5c24066b2 (patch) | |
| tree | 68a2837848c59f71a931dca65ab706ba543ddcac | |
| parent | 9cb07f126d027ddc0610fe0fcfd43016bc960ddb (diff) | |
| download | nextcloud-server-b262c30fa9780290ecd0411cee2c4da5c24066b2.tar.gz nextcloud-server-b262c30fa9780290ecd0411cee2c4da5c24066b2.zip | |
Correctly get array of groups and send OCP\IGroup objects to enable method
| -rw-r--r-- | lib/private/app.php | 10 | ||||
| -rw-r--r-- | settings/js/apps.js | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/private/app.php b/lib/private/app.php index 1b004154173..dce159d574c 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -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); } diff --git a/settings/js/apps.js b/settings/js/apps.js index bb52aa3a155..86400f7cba3 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -406,7 +406,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 = []; } |