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

Merge pull request #14886 from nextcloud/bugfix/13028/open-folder-share-list

Browse source 
Fix opening folders from different file lists
This commit is contained in:
Christoph Wurst 2019-03-27 18:48:04 +01:00 committed by GitHub
commit 839cdd9b8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/files/js/fileactions.js
View file

@ -671,7 +671,12 @@
icon: '',
actionHandler: function (filename, context) {
var dir = context.$file.attr('data-path') || context.fileList.getCurrentDirectory();
context.fileList.changeDirectory(OC.joinPaths(dir, filename), true, false, parseInt(context.$file.attr('data-id'), 10));
if (OCA.Files.App.getActiveView() !== 'files') {
OCA.Files.App.setActiveView('files');
OCA.Files.App.fileList.changeDirectory(OC.joinPaths(dir, filename), true, true);
} else {
context.fileList.changeDirectory(OC.joinPaths(dir, filename), true, false, parseInt(context.$file.attr('data-id'), 10));
}
},
displayName: t('files', 'Open')
});