Projet

Général

Profil

0001-misc-always-skip-cells-attached-to-snapshot-pages-28.patch

Frédéric Péters, 15 novembre 2018 11:14

Télécharger (1,64 ko)

Voir les différences: 

Subject: [PATCH] misc: always skip cells attached to snapshot pages (#28038)


 combo/apps/assets/views.py | 3 +--
 combo/data/models.py       | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)
combo/apps/assets/views.py
94 94 
        uniq_slots = {}
95 95 
        uniq_slots.update(settings.COMBO_ASSET_SLOTS)
96 96 
        for cell in CellBase.get_cells(
97 
                cell_filter=lambda x: bool(x.get_asset_slots),
98 
                page__snapshot__isnull=True):
97 
                cell_filter=lambda x: bool(x.get_asset_slots)):
99 98 
            uniq_slots.update(cell.get_asset_slots())
100 99 
        for key, value in uniq_slots.items():
101 100 
            yield cls(key,
combo/data/models.py
555 555 
            pages = [kwargs['page']]
556 556 
        elif 'page__in' in kwargs:
557 557 
            pages = kwargs['page__in']
558 
        else:
559 
            # if there are not explicit page, limit to non-snapshot pages
560 
            kwargs['page__snapshot__isnull'] = True
558 561 
        cell_classes = get_cell_classes()
559 562 
        if pages and not skip_cell_cache:
560 563 
            # if there's a request for some specific pages, limit cell types
561 
-