Merge branch '5.0' into feature/dev-1165-edit-element-additional-tool…

…bar-menu # Conflicts: # src/web/assets/cp/dist/cp.js # src/web/assets/cp/dist/cp.js.map
craftcms · Nov 2, 2023 · a02ffa3 · a02ffa3
2 parents 3b13f70 + e259a20
commit a02ffa3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
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/src/js/DeleteUserModal.js b/src/web/assets/cp/src/js/DeleteUserModal.js
@@ -48,7 +48,7 @@ Craft.DeleteUserModal = Garnish.Modal.extend(
           '<div id="transferselect' +
           this.id +
           '" class="elementselect">' +
-          '<div class="elements"></div>' +
+          '<ul class="elements"></ul>' +
           '<button type="button" class="btn add icon dashed">' +
           Craft.t('app', 'Choose a user') +
           '</button>' +
@@ -68,14 +68,15 @@ Craft.DeleteUserModal = Garnish.Modal.extend(
         text: Craft.t('app', 'Cancel'),
       }).appendTo($buttons);
 
+      const $contentSummary = $body.find('.content-summary');
       if (settings.contentSummary.length) {
         for (let i = 0; i < settings.contentSummary.length; i++) {
-          $body
+          $contentSummary
             .find('ul')
             .append($('<li/>', {text: settings.contentSummary[i]}));
         }
       } else {
-        $body.find('ul').remove();
+        $contentSummary.find('ul').remove();
       }
 
       this.$deleteActionRadios = $body.find('input[type=radio]');