upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-15 11:41:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 52

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

Browse source 
[stable18] apps can have polyamorous relationships with bundles
This commit is contained in:
Roeland Jago Douma 2020-01-27 20:09:34 +01:00 committed by GitHub
commit 3cc69aa901
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() {