Correctly get array of groups and send OCP\IGroup objects to enable method

diff --git a/lib/private/app.php b/lib/private/app.php
index 1b00415417394e1e3b80239489f834216a0ed518..dce159d574cb9fd2f49cf89afcaece5aea0d1d1b 100644 (file)
--- 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 bb52aa3a15551d9eed098823ce2236a6a7446b8d..86400f7cba37f0c1e4b9d51020abd30dcc8d7e2d 100644 (file)
--- 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 = [];
                        }