wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixup! Fix default action for deleted shares

Browse source 
Signed-off-by: GretaD <gretadoci@gmail.com>
This commit is contained in:
GretaD 2020-02-28 17:00:01 +01:00
parent f8d4254138
commit c510a60082
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/files/js/filelist.js
View file

@ -101,7 +101,7 @@
/**
* @type boolean
*/
_setDefaultActionsEnabled: true,
_defaultActionsEnabled: true,
/**
* Number of files per page
@ -881,7 +881,10 @@
if (!this._detailsView || $(event.target).is('.nametext, .name, .thumbnail') || $(event.target).closest('.nametext').length) {
var filename = $tr.attr('data-file');
var renaming = $tr.data('renaming');
if (!renaming && !this.setDefaultActionsEnabled) {
if (!this._defaultActionsEnabled) {
event.preventDefault();
}
else if (!renaming) {
this.fileActions.currentFile = $tr.find('td');
var mime = this.fileActions.getCurrentMimeType();
var type = this.fileActions.getCurrentType();
@ -928,7 +931,7 @@
* Event handler when default action is enabled
*/
setDefaultActionsEnabled: function(enabled) {
this._setDefaultActionsEnabled = enabled
this._defaultActionsEnabled = enabled
},
/**

1
apps/files_sharing/js/app.js
View file

@ -112,6 +112,7 @@ OCA.Sharing.App = {
{
id: 'shares.deleted',
showDeleted: true,
setDefaultActionsEnabled: false,
sharedWithUser: true,
fileActions: this._restoreShareAction(),
config: OCA.Files.App.getFilesConfig(),