wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2689 from andreas-p/fix-remote-conflict

Browse source 
Fix showConflict
This commit is contained in:
Lukas Reschke 2016-12-19 14:34:56 +01:00 committed by GitHub
commit 34fb313466
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/files/js/file-upload.js
View file

@ -129,6 +129,16 @@ OC.FileUpload.prototype = {
return OC.joinPaths(this._targetFolder, this.getFile().relativePath || ''); return OC.joinPaths(this._targetFolder, this.getFile().relativePath || '');
}, },
/**
* 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. * Returns conflict resolution mode.
* *
@ -508,9 +518,10 @@ OC.Uploader.prototype = _.extend({
return; return;
} }
// retrieve more info about this file // 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 original = fileInfo;
var replacement = file; var replacement = file;
original.directory = original.path;
OC.dialogs.fileexists(fileUpload, original, replacement, self); OC.dialogs.fileexists(fileUpload, original, replacement, self);
}); });
}, },