Projet

Général

Profil

0001-manager-mention-on-home-page-is-a-page-is-a-redirect.patch

Lauréline Guérin, 04 mars 2021 14:26

Télécharger (2,56 ko)

Voir les différences: 

Subject: [PATCH] manager: mention on home page is a page is a redirection
 (#51476)


 combo/manager/static/css/combo.manager.css      |  4 ++++
 combo/manager/templates/combo/manager_home.html |  5 ++++-
 tests/test_manager.py                           | 13 +++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
combo/manager/static/css/combo.manager.css
95 95 
	flex: 1;
96 96 
}
97 97 

  		




  
  98
  
    
div.page .group1 span {

  		




  
  99
  
    
	font-size: 80%;

  		




  
  100
  
    
}

  		




  
  101
  
    

  		




  98
  102
  
    
div.cell h3 span.extra-css-class {

  		




  99
  103
  
    
	font-size: 70%;

  		




  100
  104
  
    
	opacity: 0.7;

  		












  

    
      combo/manager/templates/combo/manager_home.html
    
  





  32
  32
  
    
 <div class="page level-{{page.level}}{% if collapse_pages %} untoggled{% endif %}" data-page-id="{{page.id}}" data-level="{{page.level}}">

  		




  33
  33
  
    
    <span class="handle">⣿</span>

  		




  34
  34
  
    
    <span class="group1">

  		




  35
  
  
    
      <a href="{% url 'combo-manager-page-view' pk=page.id %}">{{ page.title }}</a>

  		




  
  35
  
    
      <a href="{% url 'combo-manager-page-view' pk=page.id %}">

  		




  
  36
  
    
        {{ page.title }}

  		




  
  37
  
    
        {% if page.redirect_url %} <span>({% trans "redirection" %})</span>{% endif %}

  		




  
  38
  
    
      </a>

  		




  36
  39
  
    
    </span>

  		




  37
  40
  
    
    {% if not page.public %}

  		




  38
  41
  
    
    <span class="visibility-summary" title="{% trans 'Restricted visibility' %}">

  		












  

    
      tests/test_manager.py
    
  





  86
  86
  
    
    assert ('class="page level-0"' in resp.text) is not collapse

  		




  87
  87
  
    

  		




  88
  88
  
    

  		




  
  89
  
    
def test_pages_redirection(app, admin_user):

  		




  
  90
  
    
    page = Page.objects.create(title='One', slug='one')

  		




  
  91
  
    

  		




  
  92
  
    
    app = login(app)

  		




  
  93
  
    
    resp = app.get('/manage/')

  		




  
  94
  
    
    assert '(redirection)' not in resp

  		




  
  95
  
    

  		




  
  96
  
    
    page.redirect_url = 'http://www.example.net'

  		




  
  97
  
    
    page.save()

  		




  
  98
  
    
    resp = app.get('/manage/')

  		




  
  99
  
    
    assert '(redirection)' in resp

  		




  
  100
  
    

  		




  
  101
  
    

  		




  89
  102
  
    
def test_add_page(app, admin_user):

  		




  90
  103
  
    
    app = login(app)

  		




  91
  104
  
    
    resp = app.get('/manage/', status=200)

  		




  92
  
  
    
-