Projet

Général

Profil

0001-misc-give-linkcell-full-context-to-create-URL-28099.patch

Frédéric Péters, 17 novembre 2018 11:30

Télécharger (2,03 ko)

Voir les différences: 

Subject: [PATCH] misc: give linkcell full context to create URL (#28099)


 combo/data/models.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
combo/data/models.py
813 813 
    def get_cell_extra_context(self, context):
814 814 
        render_skeleton = context.get('render_skeleton')
815 815 
        request = context.get('request')
816 
        context = super(LinkCell, self).get_cell_extra_context(context)
816 
        extra_context = super(LinkCell, self).get_cell_extra_context(context)
817 817 
        if self.link_page:
818 
            context['url'] = self.link_page.get_online_url()
819 
            context['title'] = self.title or self.link_page.title
818 
            extra_context['url'] = self.link_page.get_online_url()
819 
            extra_context['title'] = self.title or self.link_page.title
820 820 
        else:
821 
            context['url'] = utils.get_templated_url(self.url)
822 
            context['title'] = self.title or self.url
821 
            extra_context['url'] = utils.get_templated_url(self.url, context=context)
822 
            extra_context['title'] = self.title or self.url
823 823 
        if self.anchor:
824 
            context['url'] += '#' + self.anchor
825 
        if render_skeleton and not urlparse.urlparse(context['url']).netloc:
824 
            extra_context['url'] += '#' + self.anchor
825 
        if render_skeleton and not urlparse.urlparse(extra_context['url']).netloc:
826 826 
            # create full URL when used in a skeleton
827 
            context['url'] = request.build_absolute_uri(context['url'])
828 
        return context
827 
            extra_context['url'] = request.build_absolute_uri(extra_context['url'])
828 
        return extra_context
829 829 

  		




  830
  830
  
    
    def get_default_form_class(self):

  		




  831
  831
  
    
        from .forms import LinkCellForm

  		




  832
  
  
    
-