diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2020-01-24 12:50:06 +0100 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2020-01-24 12:50:06 +0100 |
| commit | faf18b5f02b2f560566965030d6ca97407d3445e (patch) | |
| tree | e65b19391b7b5ca5e8bafa509d8b9ad3f112fa31 /apps | |
| parent | 2f27f122e167f27f1b09c3a4c9b70754ab953e88 (diff) | |
| download | nextcloud-server-faf18b5f02b2f560566965030d6ca97407d3445e.tar.gz nextcloud-server-faf18b5f02b2f560566965030d6ca97407d3445e.zip | |
apps can have polyamorous relationships with bundles
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/settings/lib/Controller/AppSettingsController.php | 2 | ||||
| -rw-r--r-- | apps/settings/src/components/AppList.vue | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/apps/settings/lib/Controller/AppSettingsController.php b/apps/settings/lib/Controller/AppSettingsController.php index 80ba23594a3..a49b57185c3 100644 --- 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 2fecf137dd8..5a0e570742f 100644 --- 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() { |