import: allow pages with order 0 (#44361)

This commit is contained in:
Paul Marillonnet 2020-06-23 11:55:00 +02:00
parent c43d9ee6c8
commit e26cdd7f3c
2 changed files with 3 additions and 1 deletions

View File

@ -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:

View File

@ -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