-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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.
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
Keep shares when deleting shared folders #15282
Conversation
This will make it possible to keep shares when restoring files from the trashbin. |
as discussed 👍 |
@schiesbn @DeepDiver1975 who can help to review this?� |
This cannot be reviewed yet, the other part #14676 must be merged first, else it won't work. |
@jnfrmarks small heads up for this "feature" |
I'll rebase this now that the blocking ticket was merged. |
The share entries will be linked with the fileid while they are kept in the trashbin. In the future a background just will scrape orphaned shares and delete them.
c2ca08b
to
4613022
Compare
How nice, removing code doesn't break any unit tests, maybe there weren't any for that case in the first place. Please review @DeepDiver1975 @LukasReschke @nickvergessen @MorrisJobke To test:
Then: same as 2 but delete the parent folder of the shared file/folder. |
Tested and works. Also the shares are not available for the time they are in the trashbin. 👍 |
* @param string $path | ||
*/ | ||
private static function removeShare($path) { | ||
$fileSource = self::$toRemove[$path]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
declaration of $toRemove at the top is no longer needed and can be removed too
beside the comment above 👍 |
nice - the orphant tests are failing again:
|
Weeeeird. I'll check that again locally (tests ran for me before I pushed) |
Grrrr works locally even when merged with master. @owncloud-bot retest this please |
Maybe the test order was different and somehow the trashbin didn't get disabled properly for those tests |
A new inspection was created. |
Let's hope this can help: 5803a1f According to @schiesbn, disabling the trashbin app might not be enough, stuff might still be registered. |
Refer to this link for build results (access rights to CI server needed): |
@DeepDiver1975 works now. This needs a second reviewer. Thanks. |
@PVince81 My 👍 still applies. It works as planned here |
Keep shares when deleting shared folders
I'll update the wiki page with this new "feature" |
The share entries will be linked with the fileid while they are kept in
the trashbin.
In the future a background just will scrape orphaned shares and delete
them.
(implementing a "new" feature by just deleting code!)