X Tutup
Skip to content

Fix file version names for share recipients #39314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JammingBen merged 2 commits into from
Oct 1, 2021
Merged

Fix file version names for share recipients #39314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34aff83
Fix file version names for share recipients
JammingBen Oct 1, 2021
09d4237
Add acceptance test for new version behavior
JammingBen Oct 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions changelog/unreleased/39314
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Bugfix: File version names for share recipients

With this fix, file version names now match with the actual
file name for share recipients. Before, the name has been the
timestamp of the version file.

https://github.com/owncloud/core/pull/39314
https://github.com/owncloud/core/issues/36228
13 changes: 9 additions & 4 deletions lib/private/Files/Meta/MetaFileVersionNode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@
use OCP\Files\ForbiddenException;
use OCP\Files\IProvidesAdditionalHeaders;
use OC\Preview;
use OCA\Files_Sharing\SharedStorage;
use OCP\Files\IRootFolder;
use OCP\Files\IPreviewNode;
use OCP\Files\Storage\IVersionedStorage;
use OCP\Files\Storage;
use OCP\Files\Storage\IStorage;
use OCP\IImage;

/**
Expand All @@ -45,7 +46,7 @@ class MetaFileVersionNode extends AbstractFile implements IPreviewNode, IProvide
private $versionId;
/** @var MetaVersionCollection */
private $parent;
/** @var IVersionedStorage */
/** @var IStorage|IVersionedStorage|SharedStorage */
private $storage;
/** @var string */
private $internalPath;
Expand All @@ -60,14 +61,14 @@ class MetaFileVersionNode extends AbstractFile implements IPreviewNode, IProvide
* @param MetaVersionCollection $parent
* @param IRootFolder $root
* @param array $version
* @param Storage $storage
* @param IStorage|IVersionedStorage|SharedStorage $storage
* @param string $internalPath
*/
public function __construct(
MetaVersionCollection $parent,
IRootFolder $root,
array $version,
Storage\IStorage $storage,
IStorage $storage,
$internalPath
) {
$this->parent = $parent;
Expand Down Expand Up @@ -146,6 +147,10 @@ public function getHeaders() {
* @inheritdoc
*/
public function getContentDispositionFileName() {
if ($this->storage->instanceOfStorage(SharedStorage::class)) {
$mountPoint = $this->storage->getMountPoint();
return \basename($mountPoint);
}
return \basename($this->internalPath);
}

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/features/apiVersions/fileVersionsSharingToShares.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ Feature: dav-versions
And the version folder of file "/Shares/sharefile.txt" for user "Brian" should contain "1" element
And the version folder of file "/sharefile.txt" for user "Alice" should contain "1" element

@issue-36228 @skipOnOcV10
@skipOnOcV10.6 @skipOnOcV10.7 @skipOnOcV10.8.0
Scenario: download old versions of a shared file as share receiver
Given user "Brian" has been created with default attributes and without skeleton files
And user "Alice" has uploaded file with content "uploaded content" to "textfile0.txt"
Expand Down
28 changes: 0 additions & 28 deletions tests/acceptance/features/apiVersions/fileVersionsSharingToSharesIssue36228.feature
View file
Open in desktop

This file was deleted.

X Tutup