From b80c57dab362b00b4d5a129f35f29c5d431837d2 Mon Sep 17 00:00:00 2001 From: skjnldsv Date: Tue, 16 Jul 2024 21:24:30 +0200 Subject: feat(files_sharing): use label as title and file drop destination if available Signed-off-by: skjnldsv --- apps/files_sharing/lib/DefaultPublicShareTemplateProvider.php | 6 ++++++ apps/files_sharing/templates/public.php | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/apps/files_sharing/lib/DefaultPublicShareTemplateProvider.php b/apps/files_sharing/lib/DefaultPublicShareTemplateProvider.php index 8f5ea9fd0be..e125100eb68 100644 --- a/apps/files_sharing/lib/DefaultPublicShareTemplateProvider.php +++ b/apps/files_sharing/lib/DefaultPublicShareTemplateProvider.php @@ -96,6 +96,7 @@ class DefaultPublicShareTemplateProvider implements IPublicShareTemplateProvider $shareTmpl['filename'] = $shareNode->getName(); $shareTmpl['directory_path'] = $share->getTarget(); + $shareTmpl['label'] = $share->getLabel(); $shareTmpl['note'] = $share->getNote(); $shareTmpl['mimetype'] = $shareNode->getMimetype(); $shareTmpl['previewSupported'] = $this->previewManager->isMimeSupported($shareNode->getMimetype()); @@ -240,6 +241,11 @@ class DefaultPublicShareTemplateProvider implements IPublicShareTemplateProvider $response->setHeaderDetails($this->l10n->t('shared by %s', [$shareTmpl['shareOwner']])); } + // If the share has a label, use it as the title + if ($shareTmpl['label'] !== '') { + $response->setHeaderTitle($shareTmpl['label']); + } + $isNoneFileDropFolder = $shareIsFolder === false || $share->getPermissions() !== Constants::PERMISSION_CREATE; if ($isNoneFileDropFolder && !$share->getHideDownload()) { diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 7de2bd3075e..109eaf2e9da 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -104,7 +104,10 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);

t('Upload files to %s', [$_['shareOwner']])) ?>

- + +
+

t('Upload files to %s', [$_['label']])) ?>

+

t('Upload files to %s', [$_['filename']])) ?>

-- cgit v1.2.3