Projet

Général

Profil

0001-misc-put-page-template-name-in-exported-skeleton-con.patch

Frédéric Péters, 21 novembre 2018 16:03

Télécharger (1,67 ko)

Voir les différences: 

Subject: [PATCH] misc: put page template name in exported skeleton context
 (#28225)


 combo/public/views.py | 3 +++
 tests/test_public.py  | 1 +
 2 files changed, 4 insertions(+)
combo/public/views.py
284 284 

  		




  285
  285
  
    
    template_name = combo_template['template']

  		




  286
  286
  
    
    response = render(request, template_name, ctx)

  		




  
  287
  
    
    response.content = '{%% with page_template_name="%s" %%}%s{%% endwith %%}' % (

  		




  
  288
  
    
            str(selected_page.template_name),

  		




  
  289
  
    
            response.content)

  		




  287
  290
  
    
    response['X-Combo-Page-Id'] = str(selected_page.id)

  		




  288
  291
  
    
    response['X-Combo-Skeleton-Pages'] = json.dumps(

  		




  289
  292
  
    
            dict([(x.id, utils.get_templated_url(x.redirect_url)) for x in same_domain_pages]))

  		












  

    
      tests/test_public.py
    
  





  221
  221
  
    
    resp = app.get('/__skeleton__/?source=%s' % quote('http://example.net/foo/bar'))

  		




  222
  222
  
    
    assert '{% block placeholder-content %}{% block content %}{% endblock %}{% endblock %}' in resp.text

  		




  223
  223
  
    
    assert '{% block placeholder-footer %}{% block footer %}{% endblock %}{% endblock %}' in resp.text

  		




  
  224
  
    
    assert resp.text.startswith('{% with page_template_name="standard" %}')

  		




  224
  225
  
    

  		




  225
  226
  
    
    # url netloc match

  		




  226
  227
  
    
    resp = app.get('/__skeleton__/?source=%s' % quote('http://example.net'))

  		




  227
  
  
    
-