Skip to content

Commit

Permalink
Merge pull request #47841 from nextcloud/fix/files-sharing-openfile
Browse files Browse the repository at this point in the history
fix(files_sharing): Open single-file-share by default
  • Loading branch information
mejo- authored Sep 9, 2024
2 parents 4e68e88 + 6ffe6e1 commit 0e4438f
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ public function renderPage(IShare $share, string $token, string $path): Template
$view = 'public-share';
if ($shareNode instanceof File) {
$view = 'public-file-share';
$this->initialState->provideInitialState('fileId', $shareNode->getId());
} elseif (($share->getPermissions() & \OCP\Constants::PERMISSION_CREATE)
&& !($share->getPermissions() & \OCP\Constants::PERMISSION_READ)
) {
Expand Down
11 changes: 11 additions & 0 deletions apps/files_sharing/src/init-public.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,14 @@ navigation.setActive(navigation.views.find(({ id }) => id === view) ?? null)
// Force our own router
window.OCP.Files = window.OCP.Files ?? {}
window.OCP.Files.Router = new RouterService(router)

// If this is a single file share, so set the fileid as active in the URL
const fileId = loadState<number|null>('files_sharing', 'fileId', null)
const token = loadState<string>('files_sharing', 'sharingToken')
if (fileId !== null) {
window.OCP.Files.Router.goToRoute(
'filelist',
{ ...window.OCP.Files.Router.params, token, fileid: String(fileId) },
{ ...window.OCP.Files.Router.query, openfile: 'true' },
)
}
4 changes: 2 additions & 2 deletions dist/files_sharing-init-public.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files_sharing-init-public.js.map

Large diffs are not rendered by default.

0 comments on commit 0e4438f

Please sign in to comment.