Skip to content

[stable24] Propagate attributes when resharing #34840

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
PVince81 merged 3 commits into from
Oct 27, 2022
Merged

[stable24] Propagate attributes when resharing #34840

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff653f4
Propagate attributes when resharing
CarlSchwan Oct 10, 2022
158b557
Small progress with fixing unit tests
CarlSchwan Oct 11, 2022
8ba1b3f
More fixes
CarlSchwan Oct 18, 2022
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
Prev Previous commit
Next Next commit
Small progress with fixing unit tests 
Signed-off-by: Carl Schwan <[email protected]>
  • Loading branch information
@CarlSchwan @PVince81
CarlSchwan authored and PVince81 committed Oct 27, 2022
commit 158b55747b5070b4f96240d13feb9ce9c264471e
7 changes: 5 additions & 2 deletions apps/files_sharing/lib/Controller/ShareAPIController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,7 @@ public function createShare(
$share = $this->setShareAttributes($share, $attributes);
}

$share->setSharedBy($this->currentUser);
$this->checkInheritedAttributes($share);

if ($shareType === IShare::TYPE_USER) {
Expand Down Expand Up @@ -683,7 +684,6 @@ public function createShare(
}

$share->setShareType($shareType);
$share->setSharedBy($this->currentUser);

if ($note !== '') {
$share->setNote($note);
Expand Down Expand Up @@ -1884,10 +1884,13 @@ private function setShareAttributes(IShare $share, ?string $attributesString) {
}

private function checkInheritedAttributes(IShare $share): void {
if (!$share->getSharedBy()) {
return; // Probably in a test
}
$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
$nodes = $userFolder->getById($share->getNodeId());
if (empty($nodes)) {
throw new NotFoundException('Node for share not found, fileid: ' . $share->getNodeId());
return;
}
$node = $nodes[0];
if ($node->getStorage()->instanceOfStorage(SharedStorage::class)) {
Expand Down
Loading