0001-misc-get-cells-from-private-placeholders-in-parent-a.patch

Frédéric Péters, 04 avril 2020 09:07

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

Subject: [PATCH] misc: get cells from private placeholders in parent
 acquisition (#41276)

 combo/data/models.py  | 16 +++++++++++++---
 combo/public/views.py |  8 +++++++-
 tests/test_public.py  | 36 +++++++++++++++++++++++++++++++++++-
 3 files changed, 55 insertions(+), 5 deletions(-)

     from django.db import models, transaction
     from django.db.models.base import ModelBase
     from django.db.models.signals import pre_save, post_save, post_delete
     from django.db.models import Max
     from django.db.models import Max, Q
     from django.dispatch import receiver
     from django.forms import models as model_forms
     from django import forms
-...
         default_form_class = None
         manager_form_factory_kwargs = {}
         manager_form_template = 'combo/cell_form.html'
         children_placeholder_prefix = None
         visible = True
         user_dependant = False
-...
             if load_contenttypes:
                 # populate ContentType cache
                 ContentType.objects.get_for_models(*cell_classes)
             extra_filter = kwargs.pop('extra_filter', None)
             for klass in cell_classes:
                 if klass is None:
                     continue
                 if cell_filter and not cell_filter(klass):
                     continue
                 cells_queryset = klass.objects.filter(**kwargs)
                 if extra_filter:
                     cells_queryset = cells_queryset.filter(extra_filter)
                 if select_related:
                     cells_queryset = cells_queryset.select_related(
                         *select_related.get('__all__', []),
-...
         template_name = 'combo/link-list-cell.html'
         manager_form_template = 'combo/manager/link-list-cell-form.html'
         children_placeholder_prefix = '_linkslist:'
         invalid_reason_codes = {
             'data_link_invalid': _('Invalid link'),
-...
         @property
         def link_placeholder(self):
             return '_linkslist:{}'.format(self.pk)
             return self.children_placeholder_prefix + str(self.pk)
         def get_items(self, prefetch_validity_info=False):
             return CellBase.get_cells(
-...
             cells_by_page = {}
             for page in pages:
                 cells_by_page[page.id] = []
             for cell in list(CellBase.get_cells(placeholder=self.placeholder, page__in=pages)):
             # get cells from placeholder + cells in private placeholders that may
             # be used by actual cells.
             placeholder_filter = Q(placeholder=self.placeholder)
             for klass in CellBase.get_cell_classes(lambda x: bool(x.children_placeholder_prefix)):
                 placeholder_filter |= Q(placeholder__startswith=klass.children_placeholder_prefix)
             for cell in CellBase.get_cells(page__in=pages, extra_filter=placeholder_filter):
                 cells_by_page[cell.page_id].append(cell)
             cells = cells_by_page[pages[-1].id]

         if len(hierarchy) == 1 and hierarchy[0].slug == 'index':
             # home page cannot contain parent cells
             return
         seen = {}
         for cell in cells[:]:
             if not isinstance(cell, ParentContentCell):
                 continue
             idx = cells.index(cell)
             cells[idx:idx+1] = cell.get_parents_cells(hierarchy=hierarchy[:-1])
             parent_cells = cell.get_parents_cells(hierarchy=hierarchy[:-1])
             # keep cells that were not already seen and mark cells as seen,
             # simultaneously.
             parent_cells = [seen.setdefault((x.__class__, x.id), True) and x
                     for x in parent_cells if (x.__class__, x.id) not in seen]
             cells[idx:idx + 1] = parent_cells
     def should_check_badges():

     from combo.wsgi import application
     from combo.data.models import (Page, CellBase, TextCell, ParentContentCell,
             FeedCell, LinkCell, ConfigJsonCell, Redirect, JsonCell)
             FeedCell, LinkCell, LinkListCell, ConfigJsonCell, Redirect, JsonCell)
     from combo.apps.family.models import FamilyInfosCell
     pytestmark = pytest.mark.django_db
-...
         resp = app.get('/sixth/', status=200)
         assert resp.text.count('BARFOO') == 1
     def test_list_of_links_acquisition(app):
         Page.objects.all().delete()
         index_page = Page(title='Home', slug='index', template_name='standard')
         index_page.save()
         cell = LinkListCell.objects.create(order=0, page=index_page, placeholder='footer')
         LinkCell.objects.create(
             page=index_page,
             placeholder=cell.link_placeholder,
             title='Example Site',
             url='http://example.net/',
             order=0,
+        )
         LinkCell.objects.create(
             page=index_page,
             placeholder=cell.link_placeholder,
             title='Example2 Site',
             url='http://example.org/',
             order=1,
+        )
         resp = app.get('/', status=200)
         assert resp.text.count('Example Site') == 1
         assert resp.text.count('Example2 Site') == 1
         page = Page(title='Second', slug='second', template_name='standard')
         page.save()
         ParentContentCell(page=page, placeholder='footer', order=0).save()
         resp = app.get('/second/', status=200)
         assert resp.text.count('Example Site') == 1
         assert resp.text.count('Example2 Site') == 1
     def test_page_redirect(app):
         Page.objects.all().delete()
         page = Page(title='Elsewhere', slug='elsewhere', template_name='standard',
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-misc-get-cells-from-private-placeholders-in-parent-a.patch