Merge pull request #37206 from nextcloud/fix-skip-recommended-apps-wrong-url

fix: wrong redirect when skipping recommended apps
This commit is contained in:
Christoph Wurst 2023-04-26 15:43:35 +02:00 committed by GitHub
commit defbd23cbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 11 deletions

View file

@ -59,8 +59,7 @@
<NcButton v-if="showInstallButton"
type="tertiary"
role="link"
href="defaultPageUrl"
@click="goTo(defaultPageUrl)">
:href="defaultPageUrl">
{{ t('core', 'Skip') }}
</NcButton>
@ -115,7 +114,6 @@ const recommended = {
},
}
const recommendedIds = Object.keys(recommended)
const defaultPageUrl = loadState('core', 'defaultPageUrl')
export default {
name: 'RecommendedApps',
@ -129,7 +127,7 @@ export default {
loadingApps: true,
loadingAppsError: false,
apps: [],
defaultPageUrl,
defaultPageUrl: loadState('core', 'defaultPageUrl')
}
},
computed: {
@ -180,7 +178,7 @@ export default {
.then(() => {
logger.info('all recommended apps installed, redirecting …')
window.location = defaultPageUrl
window.location = this.defaultPageUrl
})
.catch(error => logger.error('could not install recommended apps', { error }))
},
@ -210,9 +208,6 @@ export default {
}
return !!recommended[appId].hidden
},
goTo(href) {
window.location.href = href
},
},
}
</script>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long