Update changelog, Remove checkbox for single conflict

owncloud · Jun 2, 2022 · 12150d0 · 12150d0
1 parent 4a4d57e
commit 12150d0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/changelog/unreleased/enhancement-copy-move-conflict-dialog b/changelog/unreleased/enhancement-copy-move-conflict-dialog
@@ -1,6 +1,6 @@
 Enhancement: Copy/Move conflict dialog
 
-We've added a move conflict dialog for drag and drop
+We've added a conflict dialog for moving resources via drag&drop in the files list
 
 https://github.com/owncloud/web/pull/6994
 https://github.com/owncloud/web/issues/6996
diff --git a/packages/web-app-files/src/helpers/resource/move.ts b/packages/web-app-files/src/helpers/resource/move.ts
@@ -21,7 +21,8 @@ export const resolveFileExists = (
   resource,
   conflictCount,
   $gettext,
-  $gettextInterpolate
+  $gettextInterpolate,
+  isSingleConflict
 ) => {
   return new Promise<ResolveConflict>((resolve) => {
     let doForAllConflicts = false
@@ -36,11 +37,13 @@ export const resolveFileExists = (
       cancelText: $gettext('Skip'),
       confirmText: $gettext('Keep both'),
       buttonSecondaryText: $gettext('Replace'),
-      checkboxLabel: $gettextInterpolate(
-        $gettext('Do this for all %{count} conflicts'),
-        { count: conflictCount },
-        true
-      ),
+      checkboxLabel: isSingleConflict
+        ? ''
+        : $gettextInterpolate(
+            $gettext('Do this for all %{count} conflicts'),
+            { count: conflictCount },
+            true
+          ),
       onCheckboxValueChanged: (value) => {
         doForAllConflicts = value
       },
@@ -109,7 +112,8 @@ export const resolveAllConflicts = async (
       conflict.resource,
       conflictsLeft,
       $gettext,
-      $gettextInterpolate
+      $gettextInterpolate,
+      allConflicts.length === 1
     )
     conflict.strategy = result.strategy
     resolvedConflicts.push(conflict)