From 95638aadaba7e054cb865330d151989f53f8bafe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sat, 17 Nov 2018 11:29:58 +0100 Subject: [PATCH] misc: give linkcell full context to create URL (#28099) --- combo/data/models.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/combo/data/models.py b/combo/data/models.py index dba9eb81..f63c4a1a 100644 --- a/combo/data/models.py +++ b/combo/data/models.py @@ -813,19 +813,19 @@ class LinkCell(CellBase): def get_cell_extra_context(self, context): render_skeleton = context.get('render_skeleton') request = context.get('request') - context = super(LinkCell, self).get_cell_extra_context(context) + extra_context = super(LinkCell, self).get_cell_extra_context(context) if self.link_page: - context['url'] = self.link_page.get_online_url() - context['title'] = self.title or self.link_page.title + extra_context['url'] = self.link_page.get_online_url() + extra_context['title'] = self.title or self.link_page.title else: - context['url'] = utils.get_templated_url(self.url) - context['title'] = self.title or self.url + extra_context['url'] = utils.get_templated_url(self.url, context=context) + extra_context['title'] = self.title or self.url if self.anchor: - context['url'] += '#' + self.anchor - if render_skeleton and not urlparse.urlparse(context['url']).netloc: + extra_context['url'] += '#' + self.anchor + if render_skeleton and not urlparse.urlparse(extra_context['url']).netloc: # create full URL when used in a skeleton - context['url'] = request.build_absolute_uri(context['url']) - return context + extra_context['url'] = request.build_absolute_uri(extra_context['url']) + return extra_context def get_default_form_class(self): from .forms import LinkCellForm -- 2.19.1