upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 17:23:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

fix: resolving conflict when uploading multiple files via drag&drop

Browse source 
Signed-off-by: Luka Trovic <luka@nextcloud.com>
This commit is contained in:
Luka Trovic 2025-08-29 13:52:23 +02:00 committed by Luka Trovic
parent 2f8920564b
commit edd5dee342
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files/src/services/DropServiceUtils.ts
View file

@ -158,7 +158,7 @@ export const resolveConflict = async <T extends ((Directory|File)|Node)>(files:
logger.debug('Conflict resolution', { uploads, selected, renamed })
// If the user selected nothing, we cancel the upload
if (selected.length === 0 && renamed.length === 0) {
if (selected.length === 0 && renamed.length === 0 && uploads.length === 0) {
// User skipped
showInfo(t('files', 'Conflicts resolution skipped'))
logger.info('User skipped the conflict resolution')