0001-page-fix-slug-on-page-duplication-37733.patch

Lauréline Guérin, 19 novembre 2019 15:27

Voir les différences: en ligne côte à côte

Subject: [PATCH] page: fix slug on page duplication (#37733)

 combo/data/models.py | 10 ++++------
 tests/test_pages.py  |  7 ++++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

                 max_order = Page.objects.all().aggregate(Max('order')).get('order__max') or 0
                 self.order = max_order + 1
             if not self.slug:
                 if Page.objects.count() == 0:
                 if not Page.objects.exists():
                     slug = 'index'
                 else:
                     base_slug = slugify(self.title)[:40]
                     slug = base_slug.strip('-')
                 i = 1
                 while True:
                     try:
                         Page.objects.get(slug=slug, parent_id=self.parent_id)
                     except ObjectDoesNotExist:
                         break
                 while Page.objects.filter(slug=slug, parent_id=self.parent_id).exists():
                     i += 1
                     slug = '%s-%s' % (base_slug, i)
                 self.slug = slug
-...
             new_page.pk = None
             # set title
             new_page.title = _('Copy of %s') % self.title
             # reset slug
             new_page.slug = None
             # reset snapshot
             new_page.snapshot = None
             # set order

         group1 = Group.objects.create(name='foobar')
         group2 = Group.objects.create(name='fooblah')
         Page.objects.create()  # page without snapshot, with slug 'index'
         page = Page.objects.create(
             title='foo',
             slug='foo',
-...
         new_page = page.duplicate()
         assert new_page.pk != page.pk
         assert new_page.title == 'Copy of foo'
         assert new_page.slug == page.slug
         assert new_page.slug == 'copy-of-foo'
         assert new_page.description == page.description
         assert new_page.parent is None
         assert new_page.snapshot is None
-...
         assert new_cell2.placeholder == cell2.placeholder
         assert list(new_cell2.groups.all()) == []
         # duplicate again !
         new_page = page.duplicate()
         assert new_page.slug == 'copy-of-foo-2'
         parent = Page.objects.create()
         page.parent = parent
         page.save()
+    -

Produits Entr'ouvert » Combo