diff options
| author | skjnldsv <skjnldsv@protonmail.com> | 2024-07-16 21:24:30 +0200 |
|---|---|---|
| committer | skjnldsv <skjnldsv@protonmail.com> | 2024-07-18 19:47:11 +0200 |
| commit | b80c57dab362b00b4d5a129f35f29c5d431837d2 (patch) | |
| tree | 6ba3dc1d0bcb2b491945edec6af6bf2b2ad6c920 | |
| parent | 43ca07809d7d95f4896e9b1839c02d1344b51f83 (diff) | |
| download | nextcloud-server-b80c57dab362b00b4d5a129f35f29c5d431837d2.tar.gz nextcloud-server-b80c57dab362b00b4d5a129f35f29c5d431837d2.zip | |
feat(files_sharing): use label as title and file drop destination if available
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
| -rw-r--r-- | apps/files_sharing/lib/DefaultPublicShareTemplateProvider.php | 6 | ||||
| -rw-r--r-- | apps/files_sharing/templates/public.php | 5 |
2 files changed, 10 insertions, 1 deletions
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); <div id="displayavatar"><div class="avatardiv"></div></div> <h2><?php p($l->t('Upload files to %s', [$_['shareOwner']])) ?></h2> <p><span class="icon-folder"></span> <?php p($_['filename']) ?></p> - <?php } else { ?> + <?php } else if ($_['label']) { ?> + <div id="displayavatar"><span class="icon-folder"></span></div> + <h2><?php p($l->t('Upload files to %s', [$_['label']])) ?></h2> + <?php } else{ ?> <div id="displayavatar"><span class="icon-folder"></span></div> <h2><?php p($l->t('Upload files to %s', [$_['filename']])) ?></h2> <?php } ?> |