Skip to content

[stable25] fix(files_sharing): hide download permission for circle shares #39259

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.

Sign up for GitHub

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

Merged
blizzz merged 2 commits into from
Jul 12, 2023
Merged

[stable25] fix(files_sharing): hide download permission for circle shares #39259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd5dbc5
fix(files_sharing): hide download permission for circle shares
st3iny Jul 4, 2023
59b2655
style(php): satisfy style checker
blizzz Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions apps/files_sharing/src/components/SharingEntry.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,12 @@ export default {
* @return {boolean}
*/
isSetDownloadButtonVisible() {
// TODO: Implement download permission for circle shares instead of hiding the option.
// https://github.com/nextcloud/server/issues/39161
if (this.share && this.share.type === this.SHARE_TYPES.SHARE_TYPE_CIRCLE) {
return false
}

const allowedMimetypes = [
// Office documents
'application/msword',
Expand Down
4 changes: 2 additions & 2 deletions dist/files_sharing-files_sharing_tab.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files_sharing-files_sharing_tab.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/private/Files/Node/Folder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ protected function getAppDataDirectoryName(): string {
* @param int $id
* @return array
*/
protected function getByIdInRootMount(int $id): array {
protected function getByIdInRootMount(int $id): array {
if (!method_exists($this->root, 'createNode')) {
// Always expected to be false. Being a method of Folder, this is
// always implemented. For it is an internal method and should not
Expand Down