Skip to content

Do not prevent subfolder uploads if same file exists in current direc… #3382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ChristophWurst wants to merge 1 commit into from
Closed

Do not prevent subfolder uploads if same file exists in current direc… #3382

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Do not prevent subfolder uploads if same file exists in current direc… 
…tory

Signed-off-by: Christoph Wurst <[email protected]>
  • Loading branch information
@ChristophWurst @MorrisJobke
ChristophWurst authored and MorrisJobke committed Oct 27, 2017
commit 9df718d058735344f69b82dcd7d210b201d04af5
6 changes: 6 additions & 0 deletions apps/files/js/file-upload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,12 @@ OC.Uploader.prototype = _.extend({
// no list to check against
return true;
}

// We cannot detect conflicts in other folders
if (fileList.getCurrentDirectory() !== upload.getTargetFolder()) {
return true;
}

var fileInfo = fileList.findFile(file.name);
if (fileInfo) {
conflicts.push([
Expand Down