Merge pull request #19166 from nextcloud/backport/19116/stable18

[stable18] apps can have polyamorous relationships with bundles
nextcloud · Jan 27, 2020 · 3cc69aa · 3cc69aa
2 parents c99c969 + c6f2faf
commit 3cc69aa
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/apps/settings/js/vue-6.js b/apps/settings/js/vue-6.js
diff --git a/apps/settings/js/vue-6.js.map b/apps/settings/js/vue-6.js.map
diff --git a/apps/settings/js/vue-settings-apps-users-management.js b/apps/settings/js/vue-settings-apps-users-management.js
diff --git a/apps/settings/js/vue-settings-apps-users-management.js.map b/apps/settings/js/vue-settings-apps-users-management.js.map
diff --git a/apps/settings/lib/Controller/AppSettingsController.php b/apps/settings/lib/Controller/AppSettingsController.php
@@ -219,7 +219,7 @@ private function fetchApps() {
 			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
@@ -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() {