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

Add a listener to update trashed items when parent is renamed #2644

Merged
merged 4 commits into from
Jan 2, 2024

Conversation

come-nc
Copy link
Contributor

@come-nc come-nc commented Nov 28, 2023

Make sure that when renaming a folder in a groupfolder items in the trash get their original_location field updated, so that they get restored in the right place later, and ACLs with #2631 are still correctly applied.

Follow-ups:

  • Do something sensible when folder is moved out of groupfolders (move content to user trash I suppose?)

@come-nc come-nc added the 2. developing Items that are currently under development label Nov 28, 2023
@come-nc come-nc self-assigned this Nov 28, 2023
@come-nc come-nc force-pushed the fix/follow-original-location-rename branch from aa171bd to 0edd0b3 Compare November 28, 2023 15:03
@come-nc come-nc force-pushed the fix/follow-original-location-rename branch from 07281be to 35ed289 Compare December 12, 2023 17:07
@come-nc come-nc force-pushed the fix/follow-original-location-rename branch from 851560c to 9f13737 Compare January 2, 2024 13:35
@come-nc come-nc added 3. to review Items that need to be reviewed and removed 2. developing Items that are currently under development labels Jan 2, 2024
@come-nc
Copy link
Contributor Author

come-nc commented Jan 2, 2024

/backport to stable28

@come-nc
Copy link
Contributor Author

come-nc commented Jan 2, 2024

/backport to stable27

@come-nc
Copy link
Contributor Author

come-nc commented Jan 2, 2024

/backport to stable26

lib/Listeners/NodeRenamedListener.php Show resolved Hide resolved
lib/Trash/TrashManager.php Outdated Show resolved Hide resolved
come-nc and others added 4 commits January 2, 2024 15:38
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Co-authored-by: Louis <louis@chmn.me>
Signed-off-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com>
@come-nc come-nc force-pushed the fix/follow-original-location-rename branch from e447dd0 to e177b55 Compare January 2, 2024 14:38
@come-nc come-nc merged commit 70f771d into master Jan 2, 2024
41 checks passed
@come-nc come-nc deleted the fix/follow-original-location-rename branch January 2, 2024 15:04
@backportbot-nextcloud
Copy link

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

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

# Create the new backport branch
git checkout -b fix/foo-stable28

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable28

Error: Unknown error

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

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

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

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

Error: Unknown error

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

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

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

# Create the new backport branch
git checkout -b fix/foo-stable26

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

Error: Unknown error

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

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 backport-request
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants