fix: Fix conflict modal and add a resume transfert option #5884
fix: Fix conflict modal and add a resume transfert option #5884geourjoa wants to merge 30 commits intofilebrowser:masterfrom
Conversation
Sort result by index not in traversal order
…eckConflict due to method signature change
Removed comment about current folder issue in Upload.vue.
Updated the tooltip for resumeTransfer to clarify behavior.
Remove TEST_FOLDER and __debug_bin* from .gitignore
|
@ArielLeyva |
Hi @geourjoa, I've been testing the new changes. When I upload/copy/move conflicting files, the conflict resolution modal doesn't appear, and the files attempt to upload but return a 409 error. The previous version was working fine for me. I'll investigate further to see if I can help you find the problem. I'll let you know what I find. PD: I've only done the tests on Windows, I'm going to try from Linux to see if I get the same behavior. |
|
Hi @ArielLeyva Strange, we have the code running in production on our side. We use Filebrowser in a docker container on a Linux environment. I have changed very few things. I just test again and no issue on my side |
Description
My PR fix and improved the conflict modal from PR #5765. Modal has been done to solve issue #5727
#5727 has been closed but solution introduce other problems.
An other PR has been opened #5842.
The file conflicts are only searched in current directory not inside sub folder.
I fixed that and fix problem for issue #5842.
I also add an option to resume a partially failed upload.
Related issues :
I just discover an other that do the same thing : #5765, Sad that I don't see it before.
Checklist
Before submitting your PR, please indicate which issues are either fixed or closed by this PR. See GitHub Help: Closing issues using keywords.
masterbranch.