mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #19116 from nextcloud/fix/19104/fix-bundle-view 

apps can have polyamorous relationships with bundles
This commit is contained in:
blizzz 2020-01-24 19:06:29 +01:00 committed by GitHub
parent 0a2409451c dab1f5282a
commit 4e36157f3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/settings/js/vue-6.js
View File

File diff suppressed because one or more lines are too long

2
apps/settings/js/vue-6.js.map
View File

File diff suppressed because one or more lines are too long

4
apps/settings/js/vue-settings-apps-users-management.js
View File

File diff suppressed because one or more lines are too long

2
apps/settings/js/vue-settings-apps-users-management.js.map
View File

File diff suppressed because one or more lines are too long

2
apps/settings/lib/Controller/AppSettingsController.php
View File

@ -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;
}
}

4
apps/settings/src/components/AppList.vue
View File

@ -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() {