Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix app loading failure handling #4382

Merged
merged 7 commits into from
Nov 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions changelog/unreleased/default-extension
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Change: Configurable default extension

We introduced a config option in the config.json file which allows to configure the default extension for ownCloud Web.
Any of the configured extension ids can be chosen as default extension. If none is provided, we fall back to the files extension.

https://github.com/owncloud/phoenix/pull/4382
6 changes: 6 additions & 0 deletions changelog/unreleased/extension-loading
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bugfix: Unavailable extensions causing route duplication

There was an error in the extension loading handlers which caused routes to be loaded multiple times when extensions from the config.json were unavailable.
We hardened the extension loading handlers to just skip those extensions.

https://github.com/owncloud/phoenix/pull/4382
6 changes: 3 additions & 3 deletions src/components/Avatar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ export default {
}
},
computed: {
...mapGetters(['getToken']),
...mapGetters(['getToken', 'configuration']),
enabled: function() {
return this.$root.config.enableAvatars || true
return this.configuration.enableAvatars || true
}
},
watch: {
Expand Down Expand Up @@ -92,7 +92,7 @@ export default {
return
}
const headers = new Headers()
const instance = this.$root.config.server || window.location.origin
const instance = this.configuration.server || window.location.origin
const url = instance + '/remote.php/dav/avatars/' + this.userid + '/128.png'
headers.append('Authorization', 'Bearer ' + this.getToken)
headers.append('X-Requested-With', 'XMLHttpRequest')
Expand Down
2 changes: 0 additions & 2 deletions src/components/Top-Bar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

<script>
import { mapGetters } from 'vuex'
import pluginHelper from '../mixins/pluginHelper.js'
import ApplicationsMenu from './ApplicationsMenu.vue'
import UserMenu from './UserMenu.vue'
import Notifications from './Notifications.vue'
Expand All @@ -45,7 +44,6 @@ export default {
UserMenu,
SearchBar
},
mixins: [pluginHelper],
props: {
userId: {
type: String,
Expand Down
26 changes: 0 additions & 26 deletions src/mixins/pluginHelper.js

This file was deleted.

Loading