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

hide shared files located in group folder's trash bin #37448

Merged
merged 1 commit into from
Mar 30, 2023

Conversation

blizzz
Copy link
Member

@blizzz blizzz commented Mar 28, 2023

Summary

  • Shares from a group folder appear in the files list even if they are deleted
  • the code checking whether a file is accessible was laid out only for the regular trash bin
  • Needs one manual backport, because str_starts_with is not available in PHP 7.4

Checklist

@blizzz blizzz added this to the Nextcloud 27 milestone Mar 28, 2023
@blizzz blizzz requested review from nickvergessen, icewind1991, skjnldsv, a team and ArtificialOwl and removed request for a team March 28, 2023 11:53
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzz blizzz force-pushed the fix/12281/hide-deleted-shared-groupfolder-files branch from 2504bae to 28e7235 Compare March 28, 2023 12:13
@blizzz blizzz requested review from come-nc and skjnldsv March 28, 2023 12:18
@come-nc
Copy link
Contributor

come-nc commented Mar 30, 2023

Needs one manual backport, because str_starts_with is not available in PHP 7.4

We have a polyfill for it from symfony if I remember correctly, so it should work as well on 7.4.

@blizzz blizzz merged commit 488dde1 into master Mar 30, 2023
@blizzz blizzz deleted the fix/12281/hide-deleted-shared-groupfolder-files branch March 30, 2023 08:31
@blizzz
Copy link
Member Author

blizzz commented Mar 30, 2023

/backport to stable26

@blizzz
Copy link
Member Author

blizzz commented Mar 30, 2023

/backport to stable25

@blizzz
Copy link
Member Author

blizzz commented Mar 30, 2023

/backport to stable24

@blizzz
Copy link
Member Author

blizzz commented Mar 30, 2023

/backport to stable23

@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

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 stable25 failed. Please do this backport manually.

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

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

# 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-stable25

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 stable24 failed. Please do this backport manually.

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

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

# 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-stable24

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 stable23 failed. Please do this backport manually.

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

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

# 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-stable23

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

@blizzz
Copy link
Member Author

blizzz commented Mar 30, 2023

/backport to stable25

@blizzz
Copy link
Member Author

blizzz commented Mar 30, 2023

/backport to stable24

@blizzz
Copy link
Member Author

blizzz commented Mar 30, 2023

/backport to stable23

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.

deleted files reappear over and over
3 participants