diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2019-03-27 18:48:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-27 18:48:04 +0100 |
| commit | 839cdd9b8c439edb45c13572a27d51e0a57b856c (patch) | |
| tree | 39bf77892e1f9cbedf38177294262e5dc729d935 | |
| parent | 181fce8ba4d67dfbf269c11f03d9d94278436ed7 (diff) | |
| parent | 6b2a212c698a49977b7b4216ce167661cb0f62af (diff) | |
| download | nextcloud-server-839cdd9b8c439edb45c13572a27d51e0a57b856c.tar.gz nextcloud-server-839cdd9b8c439edb45c13572a27d51e0a57b856c.zip | |
Merge pull request #14886 from nextcloud/bugfix/13028/open-folder-share-list
Fix opening folders from different file lists
| -rw-r--r-- | apps/files/js/fileactions.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index a844fba40a3..bb91842fa81 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -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') }); |