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: include mountpoint in original location for trash items #3362

Merged
merged 1 commit into from
Oct 15, 2024

Conversation

icewind1991
Copy link
Member

Currently the "original location" for deleted groupfolder items don't show the path of the groupfolder itself. Making it harder for users to know what the deleted file is.

This changes it to store the "full" original location and separately keep the "interal" original location for the restore operation.

Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 icewind1991 added the 3. to review Items that need to be reviewed label Oct 15, 2024
@icewind1991 icewind1991 added this to the Nextcloud 31 milestone Oct 15, 2024
@icewind1991
Copy link
Member Author

/backport to stable30

@icewind1991
Copy link
Member Author

/backport to stable29

@icewind1991
Copy link
Member Author

/backport to stable28

@provokateurin
Copy link
Member

From #3339 we have https://github.com/x7airworker/groupfolders/blob/361d4314f6fa53a1a90735bf4fd42e30fb5d3785/tests/Trash/TrashBackendTest.php#L218 which can produce this error reliably. Can you add it and verify it fixes the test?

@icewind1991
Copy link
Member Author

This (should) only changes how the path is displayed. So I think it's orthogonal from that issue/test, which I understand to be caused by what path is stored.

@provokateurin
Copy link
Member

You're right, I confused this with another issue.

Copy link
Member

@provokateurin provokateurin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Items that need to be reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Show Correct Path for deleted files
2 participants