Merge branch 'v3' of https://github.com/craftcms/cms into develop

# Conflicts: # CHANGELOG.md # src/web/assets/cp/dist/cp.js # src/web/assets/cp/dist/cp.js.map # src/web/assets/cp/dist/css/cp.css # src/web/assets/cp/dist/css/cp.css.map
craftcms · Mar 17, 2023 · 8b51452 · 8b51452
2 parents 07adb71 + f910b80
commit 8b51452
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - The `|json_encode` Twig filter now calls `craft\helpers\Json::encode()` internally, improving error handling. ([#12919](https://github.com/craftcms/cms/issues/12919))
+- Fixed a JavaScript error that occurred when resolving an asset move conflict. ([#12920](https://github.com/craftcms/cms/issues/12920))
 - Fixed an error that could occur when rebuilding the project config, if there were any custom source definitions for element types that weren’t Composer-installed. ([#12881](https://github.com/craftcms/cms/issues/12881))
 
 ## 4.4.3 - 2023-03-16

diff --git a/src/web/assets/cp/dist/cp.js b/src/web/assets/cp/dist/cp.js
diff --git a/src/web/assets/cp/dist/cp.js.map b/src/web/assets/cp/dist/cp.js.map
diff --git a/src/web/assets/cp/dist/css/cp.css b/src/web/assets/cp/dist/css/cp.css
diff --git a/src/web/assets/cp/dist/css/cp.css.map b/src/web/assets/cp/dist/css/cp.css.map
diff --git a/src/web/assets/cp/src/css/_main.scss b/src/web/assets/cp/src/css/_main.scss
@@ -1183,7 +1183,7 @@ td.right {
 
 .customize-sources-table-column {
   display: flex;
-  align-items: start;
+  align-items: flex-start;
   align-content: stretch;
   margin-bottom: 4px;
 

diff --git a/src/web/assets/cp/src/js/AssetMover.js b/src/web/assets/cp/src/js/AssetMover.js
@@ -28,12 +28,13 @@ Craft.AssetMover = Garnish.Base.extend({
       ],
       handleConflictChoice: function (prompt) {
         const params = {
-          folderId: prompt.params.folderId,
+          folderId: prompt.request.params.folderId,
           assetId: prompt.assetId,
         };
         switch (prompt.choice) {
           case 'replace':
             params.force = true;
+            break;
           case 'keepBoth':
             params.filename = prompt.suggestedFilename;
             break;