From 069e18aa15042e3e186cfaacd8dabc4984bc94da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Thu, 17 Jan 2019 14:29:36 +0100 Subject: [PATCH] misc: fix user dependant cells exported in skeleton with django 1.11 (#29845) --- combo/public/templatetags/combo.py | 1 + tests/test_lingo_cells.py | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/combo/public/templatetags/combo.py b/combo/public/templatetags/combo.py index cf52d9e7..8791de6b 100644 --- a/combo/public/templatetags/combo.py +++ b/combo/public/templatetags/combo.py @@ -79,6 +79,7 @@ def placeholder(context, placeholder_name, **options): @register.simple_tag(takes_context=True) def render_cell(context, cell): if context.get('render_skeleton') and cell.is_user_dependant(context): + context = flatten_context(context) return template.loader.get_template('combo/deferred-cell.html').render(context) in_dashboard = False diff --git a/tests/test_lingo_cells.py b/tests/test_lingo_cells.py index e7ed268a..8bbc0376 100644 --- a/tests/test_lingo_cells.py +++ b/tests/test_lingo_cells.py @@ -6,6 +6,7 @@ import pytest from django.contrib.auth.models import User from django.test.client import RequestFactory from django.utils import timezone +from django.utils.http import quote from combo.data.models import Page from combo.apps.lingo.models import Regie, BasketItem, Transaction @@ -156,6 +157,15 @@ def test_basket_link_cell(regie, user): assert '12345' in content assert page.get_online_url() in content +def test_basket_link_cell_in_skeleton(app, regie, user): + Page.objects.all().delete() + page = Page(title='xxx', slug='test_basket_cell', template_name='standard') + page.redirect_url = 'http://example.net/foo/' + page.save() + cell = LingoBasketLinkCell(page=page, placeholder='content', order=0) + cell.save() + resp = app.get('/__skeleton__/?source=%s' % quote('http://example.net/foo/bar')) + def test_tipi_cell(): page = Page(title='example page', slug='example-page') page.save()