upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

fix(files): show proper notes about overwriting files when moving

Browse source 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
This commit is contained in:
Ferdinand Thiessen 2026-05-20 16:44:31 +02:00
parent c80ee550c8
commit 668f7f6bca
No known key found for this signature in database
GPG key ID: 7E849AE05218500F
3 changed files with 999 additions and 1003 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files/src/actions/moveOrCopyAction.ts
View file

@ -136,7 +136,7 @@ export async function * handleCopyMoveNodesTo(nodes: INode[], destination: IFold
if (method === MoveCopyAction.MOVE) {
// Let the user choose what to do with the conflicting files
const content = otherNodes.filter((n) => conflicts.some((c) => c.basename === n.basename))
const result = await openConflictPicker(destination.path, conflicts, content)
const result = await openConflictPicker(destination.path, conflicts, content, { overwriting: true })
if (!result) {
// User cancelled
return

1998
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

2
package.json
View file

@ -47,7 +47,7 @@
"@nextcloud/browserslist-config": "^3.1.2",
"@nextcloud/calendar-availability-vue": "^2.2.11",
"@nextcloud/capabilities": "^1.2.1",
"@nextcloud/dialogs": "^7.3.0",
"@nextcloud/dialogs": "^7.4.0",
"@nextcloud/event-bus": "^3.3.3",
"@nextcloud/files": "^3.12.2",
"@nextcloud/initial-state": "^3.0.0",