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(files): improve delete display name when trashbin is disabled #49199

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

st3iny
Copy link
Member

@st3iny st3iny commented Nov 11, 2024

  • Resolves: none

Summary

  1. Have an incoming share from another user.
  2. Disable files_trashbin.
  3. Observe that the three dot menu of the incoming share shows Delete permanently instead of Leave this share. This confuses some users.

Both display names Leave this share and Disconnect storage should not be influenced by the presence of the trashbin (isTrashbinEnabled()).

Before

Leave share Disconnect from external storage
grafik grafik

After

Leave share Disconnect external storage
grafik grafik

Checklist

@st3iny st3iny added this to the Nextcloud 31 milestone Nov 11, 2024
@st3iny st3iny requested a review from a team November 11, 2024 12:24
@st3iny st3iny self-assigned this Nov 11, 2024
@st3iny st3iny requested review from susnux and sorbaugh and removed request for a team November 11, 2024 12:24
@st3iny
Copy link
Member Author

st3iny commented Nov 11, 2024

/backport to stable30

@st3iny
Copy link
Member Author

st3iny commented Nov 11, 2024

/backport to stable29

@st3iny
Copy link
Member Author

st3iny commented Nov 11, 2024

/backport to stable28

Copy link
Contributor

@susnux susnux 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 for me, but lets wait on @skjnldsv as there was a lot of trouble on this action in the past.

Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
@st3iny st3iny force-pushed the fix/files/delete-display-no-trashbin branch from d11fc8a to dea6469 Compare November 18, 2024 10:29
@st3iny
Copy link
Member Author

st3iny commented Nov 18, 2024

cc @skjnldsv Friendly ping as you are the expert on this code :)

@susnux susnux requested review from a team and nfebe and removed request for a team November 18, 2024 13:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: 🏗️ In progress
Development

Successfully merging this pull request may close these issues.

2 participants