Fix two additional bugs with the ordering calculation

- The gap wasn't actually large enough. When it worked, it worked as a
  result of the natural ordering of plugins. Strangely enough, the test
  now shows a larger gap than expected, but we don't care: Ordering
  values are not meaningful in and of themselves.
- Adding cloned content to the end of an existing region actually added
  it at the beginning.

Author: matthiask

CHANGELOG.rst

@@ -8,6 +8,7 @@ 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.
+- Fixed the ordering calculation again.
 
 
 8.0 (2025-08-25)

content_editor/admin.py

@@ -274,7 +274,7 @@ def save_related(self, request, form, formsets, change):
 class CloneForm(forms.Form):
     _clone = forms.CharField()
     _clone_region = forms.CharField()
-    _clone_ordering = forms.IntegerField(required=False)
+    _clone_ordering = forms.IntegerField()
 
     def clean(self):
         data = super().clean()
@@ -300,7 +300,7 @@ def clean(self):
         return data
 
     def process(self):
-        ordering = self.cleaned_data.get("_clone_ordering") or 10
+        ordering = self.cleaned_data["_clone_ordering"]
         region = self.cleaned_data["_clone_region"]
 
         count = 0

content_editor/static/content_editor/content_editor.js

@@ -1180,43 +1180,47 @@
           dialog.close()
         })
 
+        const orderingField = crel("input", {
+          type: "hidden",
+          name: "_clone_ordering",
+        })
+
         dialog.append(
           crel("input", {
             type: "hidden",
             name: "_clone_region",
             value: ContentEditor.currentRegion,
           }),
+          orderingField,
         )
 
         dialog.append(
           crel("div", { className: "submit-row" }, [saveButton, cancelButton]),
         )
 
         const bumpOrdering = () => {
-          if (!ContentEditor._insertBefore) return
-
           const checked = qsa("input[type=checkbox]:checked", dialog).length
           const inlines = findInlinesInOrder()
           let order = 10
+          let orderingFieldSet = false
 
           for (const inline of inlines) {
             if (inline === ContentEditor._insertBefore) {
-              dialog.append(
-                crel("input", {
-                  type: "hidden",
-                  name: "_clone_ordering",
-                  value: order,
-                }),
-              )
+              orderingField.value = order
+              orderingFieldSet = true
 
               // Next order is checked-1 since we already have incremented by
               // 10 after the last item
-              order += (checked - 1) * 10
+              order += checked * 10
             }
 
             qs(".order-machine-ordering", inline).value = order
             order += 10
           }
+
+          if (!orderingFieldSet) {
+            orderingField.value = order
+          }
         }
 
         const form = qs("#content-main form")

tests/testapp/test_playwright.py

@@ -1029,7 +1029,11 @@ def test_clone_insert_between_existing_content(page: Page, django_server, client
     assert "Main content 1" in sidebar_items[1].text
     assert "Main content 2" in sidebar_items[2].text
     assert "AFTER" in sidebar_items[3].text
-    assert [item.ordering for item in sidebar_items] == [10, 20, 30, 40]
+
+    # We don't care about the exact values. Values have to be truthy and distinct though.
+    orderings = [item.ordering for item in sidebar_items]
+    assert all(orderings)
+    assert sorted(set(orderings)) == orderings
 
     # Verify the original content in main region is unchanged
     main_items = list(
@@ -1112,6 +1116,7 @@ def test_clone_backend_logic():
         "_clone_region": "sidebar",  # This specifies which region to clone TO
         # We also need to simulate the existing formset data to avoid losing it
         # This is complex because Django admin uses formsets...
+        "_clone_ordering": 100000,
     }
 
     print("Submitting clone form data...")
@@ -1192,13 +1197,6 @@ def test_clone_backend_logic():
     print(f"Clone region: {form_data.get('_clone_region', 'NOT SET')}")
 
     # Debug: Let's try a simpler form data structure to test the clone form directly
-    simple_form_data = {
-        "csrfmiddlewaretoken": form_data["csrfmiddlewaretoken"],
-        "_continue": "Save and continue editing",
-        "_clone_region": "sidebar",
-        # Note: When sending multiple values with same name, we need to ensure proper format
-    }
-
     # Add the clone items as separate entries (Django handles multiple values this way)
     clone_items = [
         f"testapp.section:{section.pk}",
@@ -1207,13 +1205,13 @@ def test_clone_backend_logic():
         f"testapp.closesection:{closesection.pk}",
     ]
 
-    print(f"Testing CloneForm directly with data: {simple_form_data}")
     print(f"Clone items: {clone_items}")
 
     # Test the CloneForm directly first
     # Create a mock request POST data
     mock_post = django.http.QueryDict(mutable=True)
     mock_post["_clone_region"] = "sidebar"
+    mock_post["_clone_ordering"] = 10000
     for item in clone_items:
         mock_post.appendlist("_clone", item)