Fix the ordering calculation when cloning

Author: matthiask

CHANGELOG.rst

@@ -5,6 +5,10 @@ Change log
 Next version
 ============
 
+- Fixed the ordering calculation when cloning content: The gap for the new
+  cloned content already had the correct size, but the base ordering value was
+  incorrect.
+
 
 8.0 (2025-08-25)
 ================

content_editor/static/content_editor/content_editor.js

@@ -1187,15 +1187,6 @@
             value: ContentEditor.currentRegion,
           }),
         )
-        if (ContentEditor._insertBefore) {
-          dialog.append(
-            crel("input", {
-              type: "hidden",
-              name: "_clone_ordering",
-              value: ContentEditor._insertBefore.style.order,
-            }),
-          )
-        }
 
         dialog.append(
           crel("div", { className: "submit-row" }, [saveButton, cancelButton]),
@@ -1204,16 +1195,27 @@
         const bumpOrdering = () => {
           if (!ContentEditor._insertBefore) return
 
-          const gap = qsa("input[type=checkbox]:checked", dialog).length - 1
+          const checked = qsa("input[type=checkbox]:checked", dialog).length
           const inlines = findInlinesInOrder()
-          let order = 0
+          let order = 10
 
           for (const inline of inlines) {
             if (inline === ContentEditor._insertBefore) {
-              order += gap
+              dialog.append(
+                crel("input", {
+                  type: "hidden",
+                  name: "_clone_ordering",
+                  value: order,
+                }),
+              )
+
+              // Next order is checked-1 since we already have incremented by
+              // 10 after the last item
+              order += (checked - 1) * 10
             }
 
-            qs(".order-machine-ordering", inline).value = 10 * ++order
+            qs(".order-machine-ordering", inline).value = order
+            order += 10
           }
         }
 

tests/testapp/test_playwright.py

@@ -909,13 +909,13 @@ def test_clone_insert_between_existing_content(page: Page, django_server, client
         text="<p>Main content 2</p>", region="main", ordering=20
     )
 
-    # Add existing content to sidebar region with gaps for insertion
-    # Use ordering values that won't be normalized during save
+    # Use ridiculous ordering values which, if not handled properly, will cause
+    # the cloned content to be inserted in an incorrect place.
     article.testapp_richtext_set.create(
-        text="<p>Sidebar BEFORE cloned content</p>", region="sidebar", ordering=10
+        text="<p>Sidebar BEFORE cloned content</p>", region="sidebar", ordering=110
     )
     article.testapp_richtext_set.create(
-        text="<p>Sidebar AFTER cloned content</p>", region="sidebar", ordering=20
+        text="<p>Sidebar AFTER cloned content</p>", region="sidebar", ordering=120
     )
 
     # Navigate to the admin change page