diff options
| author | grnd-alt <salimbelakkaf@outlook.de> | 2024-07-08 11:15:54 +0200 |
|---|---|---|
| committer | grnd-alt <salimbelakkaf@outlook.de> | 2024-07-16 09:41:42 +0200 |
| commit | 3ebfe9511b81f2b60e1691d20b13e901ab8715e0 (patch) | |
| tree | 2cff5a4d50bb5bc62f7d613d3ca22dd5e56b7fa2 /apps/files | |
| parent | 70dd8d513bf73c8d56fea2aae4a02718a328f6e3 (diff) | |
| download | nextcloud-server-3ebfe9511b81f2b60e1691d20b13e901ab8715e0.tar.gz nextcloud-server-3ebfe9511b81f2b60e1691d20b13e901ab8715e0.zip | |
fix: stop file actions when conflict dialog skipped
Signed-off-by: grnd-alt <salimbelakkaf@outlook.de>
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/src/actions/moveOrCopyAction.ts | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/apps/files/src/actions/moveOrCopyAction.ts b/apps/files/src/actions/moveOrCopyAction.ts index 5d3a7afa0e2..f4e3c6b29eb 100644 --- a/apps/files/src/actions/moveOrCopyAction.ts +++ b/apps/files/src/actions/moveOrCopyAction.ts @@ -128,11 +128,8 @@ export const handleCopyMoveNodeTo = async (node: Node, destination: Folder, meth try { // Let the user choose what to do with the conflicting files const { selected, renamed } = await openConflictPicker(destination.path, [node], otherNodes.contents) - // if the user selected to keep the old file, and did not select the new file - // that means they opted to delete the current node + // two empty arrays: either only old files or conflict skipped -> no action required if (!selected.length && !renamed.length) { - await client.deleteFile(currentPath) - emit('files:node:deleted', node) return } } catch (error) { |