fix(trashbin): Correctly set original name as displayname #46996
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
skjnldsv
reviewed
Aug 3, 2024
Comment on lines
+77
to
+80
| // Pass the real filename as the DAV display name | ||
| $propFind->handle(FilesPlugin::DISPLAYNAME_PROPERTYNAME, function () use ($node) { | ||
| return $node->getFilename(); | ||
| }); |
There was a problem hiding this comment.
Maybe deprecate nc:trashbin-filename then?
There was a problem hiding this comment.
We can do so, but wanted not to do this here as a bit unrelated. can do so in another PR.
skjnldsv
approved these changes
Aug 3, 2024
Merged
come-nc
approved these changes
Aug 5, 2024
… as display name for DAV Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
|
/backport to stable29 |
|
/backport to stable28 |
|
/backport to stable28 |
3 tasks
3 tasks
|
The backport to # Switch to the target branch and update it
git checkout stable28
git pull origin stable28
# Create the new backport branch
git checkout -b backport/46996/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 b5cd64e5 55d77fec aacf0dc5
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/46996/stable28Error: Failed to create pull request: Validation Failed: {"resource":"PullRequest","code":"custom","message":"A pull request already exists for nextcloud:backport/46996/stable28."} Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
|
This broke navigating into folders: #47153 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
If you like I can split this (see both commits):
Checklist