Skip to content
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

fix(Trash): Fix original location for deleting shared item #3358

Merged
merged 1 commit into from
Jan 28, 2025

Conversation

provokateurin
Copy link
Member

@provokateurin provokateurin commented Oct 14, 2024

Fixes #3339

@provokateurin provokateurin force-pushed the fix/trash/empty-original-location branch from fb49a13 to 9ff7e62 Compare October 14, 2024 16:01
@provokateurin provokateurin force-pushed the fix/trash/empty-original-location branch 2 times, most recently from a665bb7 to 1276961 Compare October 14, 2024 16:58
@provokateurin provokateurin force-pushed the fix/trash/empty-original-location branch from 1276961 to b848516 Compare October 28, 2024 10:01
@provokateurin provokateurin changed the title fix(Trash): Fix empty original location fix(Trash): Fix wrong original location Oct 28, 2024
@provokateurin provokateurin force-pushed the fix/trash/empty-original-location branch from b848516 to 5191596 Compare October 28, 2024 10:05
@provokateurin provokateurin force-pushed the fix/trash/empty-original-location branch from 5191596 to f7d1505 Compare January 28, 2025 08:15
@provokateurin provokateurin changed the title fix(Trash): Fix wrong original location fix(Trash): Fix original location for deleting shared item Jan 28, 2025
@provokateurin provokateurin marked this pull request as ready for review January 28, 2025 08:16
@provokateurin
Copy link
Member Author

I'm not sure if there is a more common scenario to trigger this, so that the fix needs to be extended to other storages as well.

@provokateurin provokateurin merged commit d0b8979 into master Jan 28, 2025
46 checks passed
@provokateurin provokateurin deleted the fix/trash/empty-original-location branch January 28, 2025 12:47
@provokateurin
Copy link
Member Author

/backport to stable31

@provokateurin
Copy link
Member Author

/backport to stable30

@provokateurin
Copy link
Member Author

/backport to stable29

Copy link

backportbot bot commented Jan 28, 2025

The backport to stable29 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable29
git pull origin stable29

# Create the new backport branch
git checkout -b backport/3358/stable29

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick f7d1505c

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/3358/stable29

Error: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@x7airworker
Copy link
Contributor

@provokateurin Thanks for the fix! Would it be possible to also get a backport to stable28? :)

@provokateurin
Copy link
Member Author

No, unfortunately 28 is no longer supported at all. You should update to at least 29 to still receive security and bug fixes.

For some reasons the tests don't pass on 29 and 30, so I'm also not going to fix it on those versions and it will only be in the new 31 version that will be released in less than a month.
If you want you can try to find a fix for 29 and 30 (I expect them to have the same problem) and I'm happy to review those PRs if you manage to do it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Restoring of deleted shared file inside folder inside groupfolder not possible
3 participants