Skip to content

[stable28] fix: promote re-shares when deleting the parent share #49931

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
luka-nextcloud merged 11 commits into from
Jan 6, 2025
Merged

[stable28] fix: promote re-shares when deleting the parent share #49931

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7a3a779
fix: delete re-shares when deleting the parent share
luka-nextcloud Aug 7, 2024
257b516
fix: Tidy up code for reshare deletion
come-nc Aug 22, 2024
58b64ad
fix: Transfer incomming shares first, do not delete non-migratable ones
come-nc Aug 26, 2024
c647d6c
fix(shares): Promote reshares into direct shares when share is deleted
come-nc Sep 13, 2024
fd95d1e
chore: Turn method description into phpdoc
come-nc Sep 15, 2024
a24460d
chore: Add comment to make code clearer
come-nc Sep 16, 2024
8bc34e9
fix(tests): Fix share tests to test new reshare promotion system
come-nc Oct 3, 2024
69e5ae7
fix(tests): Revert changes to tests now that reshares are not deleted…
come-nc Oct 8, 2024
30fdc6c
fix: Fix promotion of reshares from subsubfolders
come-nc Oct 14, 2024
3f695c6
fix: Use getRelativePath method to check if node is inside folder
come-nc Oct 14, 2024
4c10a79
chore: Remove syntax incompatible with PHP 8.0
come-nc Dec 19, 2024
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
fix: Transfer incomming shares first, do not delete non-migratable ones 
Canceling the previous add of deletion of invalid shares in
 transferownership because in some cases it deletes valid reshares, if
 incoming shares are not transfered on purpose.
Inverting the order of transfer between incoming and outgoing so that
 reshare can be migrated when incoming shares are transfered.

Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc @backportbot
come-nc authored and backportbot[bot] committed Dec 20, 2024
commit 58b64ad5672098334fbb6cdffec8efbbab0abb80
23 changes: 10 additions & 13 deletions apps/files/lib/Service/OwnershipTransferService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,16 +176,6 @@ public function transfer(
$output
);

$destinationPath = $finalTarget . '/' . $path;
// restore the shares
$this->restoreShares(
$sourceUid,
$destinationUid,
$destinationPath,
$shares,
$output
);

// transfer the incoming shares
if ($transferIncomingShares === true) {
$sourceShares = $this->collectIncomingShares(
Expand All @@ -210,6 +200,16 @@ public function transfer(
$move
);
}

$destinationPath = $finalTarget . '/' . $path;
// restore the shares
$this->restoreShares(
$sourceUid,
$destinationUid,
$destinationPath,
$shares,
$output
);
}

private function walkFiles(View $view, $path, Closure $callBack) {
Expand Down Expand Up @@ -488,9 +488,6 @@ private function restoreShares(
}
} catch (\OCP\Files\NotFoundException $e) {
$output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted file, skipping</error>');
} catch (\OCP\Share\Exceptions\GenericShareException $e) {
$output->writeln('<error>Share with id ' . $share->getId() . ' is broken, deleting</error>');
$this->shareManager->deleteShare($share);
} catch (\Throwable $e) {
$output->writeln('<error>Could not restore share with id ' . $share->getId() . ':' . $e->getMessage() . ' : ' . $e->getTraceAsString() . '</error>');
}
Expand Down