sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14891 from nextcloud/stable15-14886 

[stable15] Fix opening folders from different file lists
pull/14909/head
Roeland Jago Douma 2019-03-29 13:32:01 +07:00 committed by GitHub
parent aafedb9728 8ac03c67a7
commit e953ea47ea
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
Unescape Escape View File

@ -661,7 +661,12 @@
this.register('dir', 'Open', OC.PERMISSION_READ, '', 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));
}
});
this.registerAction({