summaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
authorDmitry Popov <popov@krista.ru>2016-05-24 15:09:05 +0300
committerVincent Petry <pvince81@owncloud.com>2016-05-24 14:09:05 +0200
commit83aa28ed1d0e46e2b12bae87ea2f7e0ff5168406 (patch)
tree2cfc5bbccda56b3f42b52b3853f199a163bc6b15 /apps/files/js
parentecb2bbf730ac5f70cdf543efe65367a5636d90c3 (diff)
downloadnextcloud-server-83aa28ed1d0e46e2b12bae87ea2f7e0ff5168406.tar.gz
nextcloud-server-83aa28ed1d0e46e2b12bae87ea2f7e0ff5168406.zip
My fix for #24272, #23613, File not found when single file in a folder (#24800)
* Fixed group share searching for members of multiple group. Issue #11808. * Fixed group share searching, continued. Avoid searching for empty group list in getItemSharedWithUser(). Broke tests in previous commit, #12030. * Simler check for group count. * Fix for https://github.com/owncloud/core/issues/24783 , described there * Now it's #24272, 24783 was a duplicate. Previous change was also not very good. Now we don't create ZIP with a single file inside.
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/filelist.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 58c07c60f97..38b9007d0bc 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -661,7 +661,7 @@
_onClickDownloadSelected: function(event) {
var files;
var dir = this.getCurrentDirectory();
- if (this.isAllSelected()) {
+ if (this.isAllSelected() && this.getSelectedFiles().length > 1) {
files = OC.basename(dir);
dir = OC.dirname(dir) || '/';
}