summaryrefslogtreecommitdiffstats
path: root/apps/files/js/filelist.js
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-08-31 16:32:14 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2016-10-24 21:45:00 +0200
commitf72ffa2f119f0b2644380e5c92f50dd2f05b6531 (patch)
treec368d59796f79ae2cf68de9e460edd3b8b984997 /apps/files/js/filelist.js
parent786e858d23c4a476d5b8a24d3e7eed7d8c1b5eaf (diff)
downloadnextcloud-server-f72ffa2f119f0b2644380e5c92f50dd2f05b6531.tar.gz
nextcloud-server-f72ffa2f119f0b2644380e5c92f50dd2f05b6531.zip
Fix js unit tests for webdav put upload changes
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/files/js/filelist.js')
-rw-r--r--apps/files/js/filelist.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 2d6bca80f1a..d4a223058b4 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -2724,16 +2724,16 @@
// add target dir
data.targetDir = dir;
} else {
- // we are dropping somewhere inside the file list, which will
- // upload the file to the current directory
- data.targetDir = self.getCurrentDirectory();
-
// cancel uploads to current dir if no permission
var isCreatable = (self.getDirectoryPermissions() & OC.PERMISSION_CREATE) !== 0;
if (!isCreatable) {
self._showPermissionDeniedNotification();
return false;
}
+
+ // we are dropping somewhere inside the file list, which will
+ // upload the file to the current directory
+ data.targetDir = self.getCurrentDirectory();
}
});
uploader.on('add', function(e, data) {