Skip to content

[stable27] fix: Keep download action for files and hide only for relevant files #45344

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
AndyScherzinger merged 3 commits into from
May 23, 2024
Merged

[stable27] fix: Keep download action for files and hide only for relevant files #45344

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8003e4
fix: Keep download action for files and hide only for relevant files
juliusknorr May 16, 2024
ffda00b
fix: Hide download action in shares view
Pytal May 22, 2024
b6988c7
chore: compile assets
Pytal May 22, 2024
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
Next Next commit
fix: Keep download action for files and hide only for relevant files 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr @Pytal
juliusknorr authored and Pytal committed May 22, 2024
commit c8003e480b2320c998d7c088eeeaac1a72fe2af2
14 changes: 14 additions & 0 deletions apps/files/js/fileactions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,13 @@
context.fileList.showFileBusyState(filename, true);
OCA.Files.Files.handleDownload(url, disableLoadingState);
}
},
shouldRender: function(context) {
var fileData = context.fileInfoModel
if (_.isFunction(fileData.canDownload) && !fileData.canDownload()) {
return false;
}
return true;
}
});

Expand Down Expand Up @@ -707,6 +714,13 @@
}
context.fileList.dirInfo.dirLastCopiedTo = targetPath;
}, false, "httpd/unix-directory", true, actions, dialogDir);
},
shouldRender: function(context) {
var fileData = context.fileInfoModel
if (_.isFunction(fileData.canDownload) && !fileData.canDownload()) {
return false;
}
return true;
}
});

Expand Down
6 changes: 6 additions & 0 deletions apps/files/js/fileactionsmenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@
var defaultAction = fileActions.getCurrentDefaultFileAction();

var items = _.filter(actions, function(actionSpec) {
if (actionSpec.shouldRender) {
if (!actionSpec.shouldRender(self._context)) {
return false;
}
}

return !defaultAction || actionSpec.name !== defaultAction.name;
});
items = _.map(items, function(item) {
Expand Down
13 changes: 0 additions & 13 deletions apps/files_sharing/src/share.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,19 +86,6 @@ import { getCapabilities } from '@nextcloud/capabilities'
var tr = oldCreateRow.apply(this, arguments)
var sharePermissions = OCA.Sharing.Util.getSharePermissions(fileData)

if (fileData.permissions === 0) {
// no permission, disabling sidebar
delete fileActions.actions.all.Comment
delete fileActions.actions.all.Details
delete fileActions.actions.all.Goto
Comment on lines -91 to -93
Copy link
Member Author

@juliusknorr juliusknorr May 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems already done with the permissions checks on the individual actions

}
if (_.isFunction(fileData.canDownload) && !fileData.canDownload()) {
delete fileActions.actions.all.Download
if ((fileData.permissions & OC.PERMISSION_UPDATE) === 0) {
// neither move nor copy is allowed, remove the action completely
delete fileActions.actions.all.MoveCopy
}
}
tr.attr('data-share-permissions', sharePermissions)
tr.attr('data-share-attributes', JSON.stringify(fileData.shareAttributes))
if (fileData.shareOwner) {
Expand Down