Merge branch 'master' of github.com:jrief/django-admin-sortable2

Author: jrief

.github/workflows/tests.yml

@@ -23,7 +23,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         node-version: ["18.x"]
         django-version: ["4.2.*", "5.0.*", "5.1.*"]
         exclude:  # https://docs.djangoproject.com/en/5.0/faq/install/#what-python-version-can-i-use-with-django

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Release history of [django-admin-sortable2](https://github.com/jrief/django-admin-sortable2/)
 
+### 2.2.6
+- Fix adding new models with inlines: automatically set order of new entries.
+
+### 2.2.5
+- Fix sorting in parallel requests.
+- Add support for Python 3.13.
+
 ### 2.2.4
 - Fix: Selected ordering is not always preserved when using "Save as new" in inline admin.
 

adminsortable2/__init__.py

@@ -1 +1 @@
-__version__ = '2.2.4'
+__version__ = '2.2.6'

adminsortable2/admin.py

@@ -487,7 +487,7 @@ def save_new(self, form, commit=True):
         obj = super().save_new(form, commit=False)
 
         order_field_value = getattr(obj, self.default_order_field, None)
-        if order_field_value is None or order_field_value < 0:
+        if order_field_value is None or order_field_value <= 0:
             max_order = self.get_max_order()
             setattr(obj, self.default_order_field, max_order + 1)
         if commit:

package-lock.json

@@ -8,7 +8,7 @@
   "devDependencies": {
     "@types/sortablejs": "^1.15.8",
     "esbuild": "^0.21.2",
-    "playwright": "^1.44.0",
+    "playwright": "^1.51.0",
     "sortablejs": "^1.15.2",
     "tslib": "^2.6.2",
     "typescript": "^4.9.5",

package.json

@@ -99,6 +99,7 @@ class Chapter(models.Model):
         blank=False,
         null=False,
         db_index=True,
+        default=0,
     )
 
     def __str__(self):

testapp/models.py

@@ -2,7 +2,7 @@
 from time import sleep
 from playwright.sync_api import expect
 
-from testapp.models import Book
+from testapp.models import Book, Chapter
 
 
 slugs = [
@@ -119,3 +119,26 @@ def test_move_begin(adminpage, slug, direction, chapter, drag_selector):
     expect(inline_locator.locator(f'{chapter}_set-8 input._reorder_')).to_have_value(str(start_order))
     expect(inline_locator.locator(f'{chapter}_set-3 input._reorder_')).to_have_value(str(start_order + direction * 4))
     expect_fieldset_is_ordered(inline_locator, direction)
+
+
+@pytest.mark.parametrize('slug', ["book1"])
+def test_create(adminpage, slug, direction, chapter, drag_selector):
+    adminpage.get_by_role("link", name="Books (ordered by model,").click()
+    adminpage.get_by_role("link", name="Add book1").click()
+    adminpage.locator("#id_title").fill("test")
+    adminpage.get_by_label("Author:").select_option("8")
+    adminpage.locator("#id_chapter1_set-0-title").click()
+    adminpage.locator("#id_chapter1_set-0-title").fill("111")
+    adminpage.get_by_role("link", name="Add another Chapter1").click()
+    adminpage.locator("#id_chapter1_set-1-title").click()
+    adminpage.locator("#id_chapter1_set-1-title").fill("222")
+    adminpage.get_by_role("link", name="Add another Chapter1").click()
+    adminpage.locator("#id_chapter1_set-2-title").click()
+    adminpage.locator("#id_chapter1_set-2-title").fill("333")
+    adminpage.get_by_role("button", name="Save", exact=True).click()
+
+    assert Chapter.objects.get(title="111").my_order == 1
+    assert Chapter.objects.get(title="222").my_order == 2
+    assert Chapter.objects.get(title="333").my_order == 3
+    assert Book.objects.get(title="test").my_order != 0
+