mirror of
https://github.com/nextcloud/server.git
synced 2026-04-22 14:50:17 -04:00
Merge pull request #37206 from nextcloud/fix-skip-recommended-apps-wrong-url
fix: wrong redirect when skipping recommended apps
This commit is contained in:
commit
defbd23cbf
3 changed files with 6 additions and 11 deletions
|
|
@ -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>
|
||||
|
|
|
|||
4
dist/core-recommendedapps.js
vendored
4
dist/core-recommendedapps.js
vendored
File diff suppressed because one or more lines are too long
2
dist/core-recommendedapps.js.map
vendored
2
dist/core-recommendedapps.js.map
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue