apps can have polyamorous relationships with bundles

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

diff --git a/apps/settings/lib/Controller/AppSettingsController.php b/apps/settings/lib/Controller/AppSettingsController.php
index 80ba23594a3604ef14aeda2e42fcfe849fb192e7..a49b57185c3a5fd8b4de85902dc45181bd9b42d7 100644 (file)
--- a/apps/settings/lib/Controller/AppSettingsController.php
+++ b/apps/settings/lib/Controller/AppSettingsController.php
@@ -219,7 +219,7 @@ class AppSettingsController extends Controller {
                        foreach($bundle->getAppIdentifiers() as $identifier) {
                                foreach($this->allApps as &$app) {
                                        if($app['id'] === $identifier) {
-                                               $app['bundleId'] = $bundle->getIdentifier();
+                                               $app['bundleIds'][] = $bundle->getIdentifier();
                                                continue;
                                        }
                                }

diff --git a/apps/settings/src/components/AppList.vue b/apps/settings/src/components/AppList.vue
index 2fecf137dd8492f25a63c6d610464f3b3c683c8f..5a0e570742f68d8b5bb5fc636405d298a04e0a14 100644 (file)
--- a/apps/settings/src/components/AppList.vue
+++ b/apps/settings/src/components/AppList.vue
@@ -158,7 +158,9 @@ export default {
                bundleApps() {
                        return function(bundle) {
                                return this.$store.getters.getAllApps
-                                       .filter(app => app.bundleId === bundle)
+                                       .filter(app => {
+                                               return app.bundleIds !== undefined && app.bundleIds.includes(bundle)
+                                       })
                        }
                },
                searchApps() {