diff options
| author | pflug <dev@admin4.org> | 2016-12-15 10:19:55 +0100 |
|---|---|---|
| committer | Andreas Pflug <dev@admin4.org> | 2016-12-19 08:11:04 +0100 |
| commit | c7fc010215f22aaff9380cb308f4794d7e2bba99 (patch) | |
| tree | c90d7da19f068ce15ad204a2f833ab91dd89676e /apps | |
| parent | 3714a6aaf0b565808bd1ec7f8552196447402f58 (diff) | |
| download | nextcloud-server-c7fc010215f22aaff9380cb308f4794d7e2bba99.tar.gz nextcloud-server-c7fc010215f22aaff9380cb308f4794d7e2bba99.zip | |
Fix showConflict
use getFullFileName to show conflicting file
add original.directory to make fileExists happy
Signed-off-by: Andreas Pflug <dev@admin4.org>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/js/file-upload.js | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index b3a59b54241..25136d042a9 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -130,6 +130,16 @@ OC.FileUpload.prototype = { }, /** + * Get full path for the target file, + * including relative path and file name. + * + * @return {String} full path + */ + getFullFilePath: function() { + return OC.joinPaths(this.getFullPath(), this.getFile().name); + }, + + /** * Returns conflict resolution mode. * * @return {int} conflict mode @@ -508,9 +518,10 @@ OC.Uploader.prototype = _.extend({ return; } // retrieve more info about this file - this.filesClient.getFileInfo(fileUpload.getFullPath()).then(function(status, fileInfo) { + this.filesClient.getFileInfo(fileUpload.getFullFilePath()).then(function(status, fileInfo) { var original = fileInfo; var replacement = file; + original.directory = original.path; OC.dialogs.fileexists(fileUpload, original, replacement, self); }); }, |