Projet

Général

Profil

0001-wcs-no-div-cell-body-if-custom-schema-is-empty-58326.patch

Lauréline Guérin, 17 décembre 2021 16:57

Télécharger (2,07 ko)

Voir les différences: 

Subject: [PATCH] wcs: no div cell--body if custom schema is empty (#58326)


 combo/apps/wcs/templates/combo/wcs/card.html | 8 ++++++--
 tests/test_wcs.py                            | 6 ++++++
 2 files changed, 12 insertions(+), 2 deletions(-)
combo/apps/wcs/templates/combo/wcs/card.html
9 9 
{% endblock %}
10 10 

  		




  11
  11
  
    
{% if card.id %}

  		




  12
  
  
    
<div class="cell--body">

  		




  13
  12
  
    
{% spaceless %}

  		




  14
  13
  
    
{% if cell.custom_schema %}

  		




  
  14
  
    
{% if cell.custom_schema.cells %}

  		




  
  15
  
    
<div class="cell--body">

  		




  15
  16
  
    
  <div class="{{ cell.custom_schema.grid_class }}">

  		




  16
  17
  
    
    {% for item in cell.custom_schema.cells %}

  		




  17
  18
  
    
      <div class="{{ item.cell_size|default:"" }}">

  		




  ......




  45
  46
  
    
      </div>

  		




  46
  47
  
    
    {% endfor%}

  		




  47
  48
  
    
  </div>

  		




  
  49
  
    
</div>

  		




  
  50
  
    
{% endif %}

  		




  48
  51
  
    

  		




  49
  52
  
    
{% else %}

  		




  
  53
  
    
<div class="cell--body">

  		




  50
  54
  
    
{% for field in schema.fields %}

  		




  51
  55
  
    
  {% if 'varname' in field and field.varname %}

  		




  52
  56
  
    
  {% with card.fields|get:field.varname as value %}

  		




  ......




  57
  61
  
    
  {% endwith %}

  		




  58
  62
  
    
  {% endif %}

  		




  59
  63
  
    
{% endfor %}

  		




  
  64
  
    
</div>

  		




  60
  65
  
    
{% endif %}

  		




  61
  66
  
    
{% endspaceless %}

  		




  62
  
  
    
</div>

  		




  63
  67
  
    

  		




  64
  68
  
    
{% else %}

  		




  65
  69
  
    
<div class="cell--body">

  		












  

    
      tests/test_wcs.py
    
  





  2002
  2002
  
    
    assert PyQuery(result).find('p.label').text() == 'Foo bar baz'

  		




  2003
  2003
  
    
    assert PyQuery(result).find('div.value').text() == 'Foo,Bar'

  		




  2004
  2004
  
    

  		




  
  2005
  
    
    # custom schema but empty

  		




  
  2006
  
    
    cell.custom_schema = {'cells': []}

  		




  
  2007
  
    
    cell.save()

  		




  
  2008
  
    
    result = cell.render(context)

  		




  
  2009
  
    
    assert PyQuery(result).find('div.cell--body') == []

  		




  
  2010
  
    

  		




  2005
  2011
  
    

  		




  2006
  2012
  
    
@mock.patch('combo.apps.wcs.utils.requests.send', side_effect=mocked_requests_send)

  		




  2007
  2013
  
    
def test_card_cell_render_identifier(mock_send, nocache, app):

  		




  2008
  
  
    
-