Skip to content

[stable22] Extend pending shares list in frontend to include remote shares #28209

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
skjnldsv merged 14 commits into from
Aug 19, 2021
Merged

[stable22] Extend pending shares list in frontend to include remote shares #28209

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
df835ed
Extend pending shares list to include remote shares
PVince81 Jul 1, 2021
08ab5d9
Fix received federated group shares
PVince81 Jul 2, 2021
13781b0
Remove "Reject share" for pending remote shares
PVince81 Jul 2, 2021
4d0f009
Add logging to external shares manager
PVince81 Jul 2, 2021
37a6523
Fix re-accepting or re-rejecting remote group shares
PVince81 Jul 2, 2021
9c0e1d8
Pending remote group share fixes
PVince81 Jul 2, 2021
dde4c9d
Disable default actions in pending file list
PVince81 Jul 5, 2021
701de23
Fix remote group share API interactions
PVince81 Jul 5, 2021
df0ca2f
Fix external share manager with multiple user groups
PVince81 Jul 13, 2021
5b11196
Use mimetype instead of type when defaulting in remote shares
PVince81 Jul 19, 2021
2e76d98
Fix remote group share decline+accept code path
PVince81 Jul 20, 2021
33b0118
Replace ILogger with LoggerInterface in remote share manager
PVince81 Jul 20, 2021
a22ea02
Fix route path for pending remote shares
PVince81 Jul 27, 2021
f60ea8a
Fix remote share deletion when deleting user
PVince81 Jul 27, 2021
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
Prev Previous commit
Next Next commit
Disable default actions in pending file list 
Signed-off-by: Vincent Petry <[email protected]>
  • Loading branch information
@PVince81
PVince81 committed Aug 10, 2021
commit dde4c9d9dfd5e4f241b0464667c0f2410d9851ed
5 changes: 5 additions & 0 deletions apps/files/js/gotoplugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
if (this.disallowedLists.indexOf(fileList.id) !== -1) {
return;
}
// lists where the "Open" default action is disabled should
// also have the goto action disabled
if (fileList._defaultFileActionsDisabled) {
return
}
var fileActions = fileList.fileActions;

fileActions.registerAction({
Expand Down
2 changes: 2 additions & 0 deletions apps/files_sharing/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ OCA.Sharing.App = {
{
id: 'shares.pending',
showPending: true,
detailsViewEnabled: false,
defaultFileActionsDisabled: true,
sharedWithUser: true,
fileActions: this._acceptShareAction(),
config: OCA.Files.App.getFilesConfig(),
Expand Down
4 changes: 4 additions & 0 deletions apps/files_sharing/src/share.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,10 @@ import escapeHTML from 'escape-html'
},
type: OCA.Files.FileActions.TYPE_INLINE,
actionHandler: function(fileName, context) {
// details view disabled in some share lists
if (!fileList._detailsView) {
return
}
// do not open sidebar if permission is set and equal to 0
var permissions = parseInt(context.$file.data('share-permissions'), 10)
if (isNaN(permissions) || permissions > 0) {
Expand Down