mirror of
https://github.com/nextcloud/server.git
synced 2026-06-09 00:32:29 -04:00
Merge pull request #47015 from nextcloud/fix/open-file
fix(files): Correctly handle open file URL query
This commit is contained in:
commit
50e6108e5a
4 changed files with 10 additions and 5 deletions
|
|
@ -335,6 +335,8 @@ class ViewController extends Controller {
|
|||
} else {
|
||||
// set parent path as dir
|
||||
$params['dir'] = $baseFolder->getRelativePath($node->getParent()->getPath());
|
||||
// open the file by default (opening the viewer)
|
||||
$params['openfile'] = 'true';
|
||||
}
|
||||
return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.indexViewFileid', $params));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ export function useRouteParameters() {
|
|||
const directory = computed<string>(
|
||||
() => String(route.query.dir || '/')
|
||||
// Remove any trailing slash but leave root slash
|
||||
.replace(/^(.+)\/$/, '$1')
|
||||
.replace(/^(.+)\/$/, '$1'),
|
||||
)
|
||||
|
||||
/**
|
||||
|
|
@ -32,7 +32,10 @@ export function useRouteParameters() {
|
|||
/**
|
||||
* State of `openFile` route param
|
||||
*/
|
||||
const openFile = computed<boolean>(() => 'openFile' in route.params && route.params.openFile.toLocaleLowerCase() !== 'false')
|
||||
const openFile = computed<boolean>(
|
||||
// if `openfile` is set it is considered truthy, but allow to explicitly set it to 'false'
|
||||
() => 'openfile' in route.query && (typeof route.query.openfile !== 'string' || route.query.openfile.toLocaleLowerCase() !== 'false'),
|
||||
)
|
||||
|
||||
return {
|
||||
/** Path of currently open directory */
|
||||
|
|
|
|||
4
dist/files-main.js
vendored
4
dist/files-main.js
vendored
File diff suppressed because one or more lines are too long
2
dist/files-main.js.map
vendored
2
dist/files-main.js.map
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue