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

feat(trashbin): Add deleted by properties #44643

Merged
merged 4 commits into from
Apr 23, 2024
Merged

Conversation

Pytal
Copy link
Member

@Pytal Pytal commented Apr 3, 2024

Summary

  • Store and provide a new trashbin-deleted-by-id and trashbin-deleted-by-display-name DAV properties

  • Example PROPFIND request data

<?xml version="1.0"?>
<d:propfind xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns" xmlns:nc="http://nextcloud.org/ns">
  <d:prop>
    <oc:fileid />
    <d:displayname />
    <d:getlastmodified />
    <d:getcontenttype />
    <oc:size />
    <oc:owner-id />
    <oc:share-types />
    <nc:sharees />
    <nc:share-download-limits />
    <nc:trashbin-filename />
    <nc:trashbin-deletion-time />
    <nc:trashbin-original-location />
    <nc:trashbin-title />
    <nc:trashbin-deleted-by />
  </d:prop>
</d:propfind>

Checklist

@Pytal Pytal added this to the Nextcloud 30 milestone Apr 3, 2024
@Pytal Pytal requested review from icewind1991 and a team April 3, 2024 17:58
@Pytal Pytal self-assigned this Apr 3, 2024
@Pytal Pytal requested review from ArtificialOwl, sorbaugh and Altahrim and removed request for a team April 3, 2024 17:58
@Pytal Pytal force-pushed the feat/trashbin-deleted-by branch 3 times, most recently from c66be6e to 3b338fe Compare April 4, 2024 18:51
@Pytal Pytal changed the title feat(trashbin): Add deleted by property feat(trashbin): Add deleted by properties Apr 4, 2024
@Pytal Pytal requested review from Altahrim and tcitworld April 4, 2024 18:51
icewind1991

This comment was marked as resolved.

@icewind1991

This comment was marked as resolved.

@Pytal Pytal requested a review from icewind1991 April 11, 2024 00:23
@Pytal Pytal force-pushed the feat/trashbin-deleted-by branch 2 times, most recently from d1672d9 to 1c3b229 Compare April 12, 2024 00:30
@Pytal Pytal force-pushed the feat/trashbin-deleted-by branch 2 times, most recently from 3b46ab2 to 6e49424 Compare April 17, 2024 22:42
@Pytal
Copy link
Member Author

Pytal commented Apr 17, 2024

Switched the column back to nullable to fix potential migration errors with oracle which converts empty string to null

Copy link
Contributor

@come-nc come-nc left a comment

Choose a reason for hiding this comment

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

Did you test that with groupfolders?

apps/files_trashbin/lib/Trash/TrashItem.php Outdated Show resolved Hide resolved
apps/files_trashbin/lib/Trashbin.php Outdated Show resolved Hide resolved
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal
Copy link
Member Author

Pytal commented Apr 23, 2024

Did you test that with groupfolders?

Seems it breaks groupfolders as it implements a custom trash backend, documented the change here nextcloud/documentation#11757

App devs will have to update their custom trash backends to support this for 30

@Pytal Pytal merged commit 4618e28 into master Apr 23, 2024
157 checks passed
@Pytal Pytal deleted the feat/trashbin-deleted-by branch April 23, 2024 23:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants