From e26cdd7f3cbd62ff1e07d6f67c98847227d1f57b Mon Sep 17 00:00:00 2001 From: Paul Marillonnet Date: Tue, 23 Jun 2020 11:55:00 +0200 Subject: [PATCH] import: allow pages with order 0 (#44361) --- combo/data/models.py | 2 +- tests/test_pages.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/combo/data/models.py b/combo/data/models.py index 0e8b0c2b..e47e778b 100644 --- a/combo/data/models.py +++ b/combo/data/models.py @@ -186,7 +186,7 @@ class Page(models.Model): def save(self, *args, **kwargs): if not self.id: self.related_cells = {'cell_types': []} - if not self.order: + if self.order is None: max_order = Page.objects.all().aggregate(Max('order')).get('order__max') or 0 self.order = max_order + 1 if not self.slug: diff --git a/tests/test_pages.py b/tests/test_pages.py index b5fb40f3..6f623ed4 100644 --- a/tests/test_pages.py +++ b/tests/test_pages.py @@ -159,6 +159,7 @@ def test_import_export_pages(): new_page_1 = Page.objects.all().order_by('order')[0] new_page_2 = Page.objects.all().order_by('order')[1] + assert new_page_1.order < new_page_2.order assert new_page_1.title == 'foo' assert new_page_2.title == 'bar' assert new_page_1.description == "Foo's page" @@ -358,6 +359,7 @@ def test_import_export_management_commands(): new_page_1 = Page.objects.all().order_by('order')[0] new_page_2 = Page.objects.all().order_by('order')[1] + assert new_page_1.order < new_page_2.order assert new_page_1.title == 'foo' assert new_page_2.title == 'bar' assert len(CellBase.get_cells(page_id=new_page_1.id)) == 1