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

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 2b3751a7e4
commit 511ad14338
No known key found for this signature in database
GPG key ID: 7E849AE05218500F
5 changed files with 541 additions and 781 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -134,7 +134,7 @@ export async function* handleCopyMoveNodesTo(nodes: INode[], destination: IFolde
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

827
build/frontend-legacy/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

2
build/frontend-legacy/package.json
View file

@ -36,7 +36,7 @@
"@nextcloud/axios": "^2.5.2",
"@nextcloud/browser-storage": "^0.5.0",
"@nextcloud/capabilities": "^1.2.1",
"@nextcloud/dialogs": "^7.3.0",
"@nextcloud/dialogs": "^7.4.0",
"@nextcloud/event-bus": "^3.3.3",
"@nextcloud/files": "^4.0.0",
"@nextcloud/initial-state": "^3.0.0",

489
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

2
package.json
View file

@ -45,7 +45,7 @@
"@nextcloud/axios": "^2.5.2",
"@nextcloud/calendar-availability-vue": "^3.0.0",
"@nextcloud/capabilities": "^1.2.1",
"@nextcloud/dialogs": "^7.3.0",
"@nextcloud/dialogs": "^7.4.0",
"@nextcloud/event-bus": "^3.3.3",
"@nextcloud/files": "^4.0.0",
"@nextcloud/initial-state": "^3.0.0",