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

Merge pull request #54780 from nextcloud/backport/54738/stable31

Browse source
This commit is contained in:
Kate 2025-09-01 16:41:55 +02:00 committed by GitHub
commit 338887215b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 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')

4
dist/files-main.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/files-main.js.map vendored
View file

File diff suppressed because one or more lines are too long