diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2019-01-30 15:52:04 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-30 15:52:04 +0300 |
| commit | 3add3f997e6ef926b0ecac48f385f607050fecdc (patch) | |
| tree | f41ef817e685d0709157fcd9072e891fa6f80ad8 | |
| parent | bce6e7fc2be534977e35b2e5037501b2efae514d (diff) | |
| parent | 6fb6f3872e0f873d2e9bc695fd31ace4db8c66ab (diff) | |
Merge pull request #13888 from nextcloud/backport/13883/stable14
[stable14] Fix dropping a folder on a folder row
| -rw-r--r-- | apps/files/js/file-upload.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 9c1e2df53a0..31577e9a76b 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -516,7 +516,9 @@ OC.Uploader.prototype = _.extend({ self.filesClient.createDirectory(fullPath).always(function(status) { // 405 is expected if the folder already exists if ((status >= 200 && status < 300) || status === 405) { - self.trigger('createdfolder', fullPath); + if (status !== 405) { + self.trigger('createdfolder', fullPath); + } deferred.resolve(); return; } |