Projet

Général

Profil

0001-wcs-file-display-in-card-detail-cell-50971.patch

Lauréline Guérin, 09 février 2021 16:10

Télécharger (3,42 ko)

Voir les différences: 

Subject: [PATCH] wcs: file display in card detail cell (#50971)


 combo/apps/wcs/templates/combo/wcs/card.html |  7 +++++++
 tests/test_wcs.py                            | 16 ++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
combo/apps/wcs/templates/combo/wcs/card.html
19 19 
    <span class="value">{{ value|date }}</span>
20 20 
    {% elif field.type == "bool" and value is not None %}
21 21 
    <span class="value">{{ value|yesno }}</span>
22 
    {% elif field.type == "file" and value %}
23 
    <span class="value">
24 
        <a href="{{ value.url }}">
25 
            <img src="{{ value.url }}&thumbnail=1" />
26 
            <span>{{ value.filename }}</span>
27 
        </a>
28 
    </span>
22 29 
    {% else %}
23 30 
    <span class="value">{{ value|default:"" }}</span>
24 31 
    {% endif %}
tests/test_wcs.py
143 143 
        {'label': 'Field A', 'varname': 'fielda', 'type': 'string'},
144 144 
        {'label': 'Field B', 'varname': 'fieldb', 'type': 'bool'},
145 145 
        {'label': 'Field C', 'varname': 'fieldc', 'type': 'date'},
146 
        {'label': 'Field D', 'varname': 'fieldd', 'type': 'file'},
146 147 
        {'label': 'Related', 'varname': 'related', 'type': 'item'},
147 148 
        {'label': 'Page', 'type': 'page'},
148 149 
        {'label': 'Comment', 'type': 'comment'},
......
163 164 
        'fielda': 'a',
164 165 
        'fieldb': True,
165 166 
        'fieldc': '2020-09-28',
167 
        'fieldd': {'filename': 'file.pdf', 'url': 'http://some-url.com/download?f=42'},
166 168 
        'related': 'Foo Bar',
167 169 
        'related_raw': 42,
168 170 
        'related_structured': {'id': 42, 'text': 'blah'},
......
1381 1383 

  		




  1382
  1384
  
    
    mock_send.reset_mock()

  		




  1383
  1385
  
    
    result = cell.render(context)

  		




  
  1386
  
    
    result = result.replace('    ', '')

  		




  
  1387
  
    
    result = result.replace('\n', '')

  		




  1384
  1388
  
    
    assert '<h2>Card Model 1 - aa</h2>' in result

  		




  1385
  
  
    
    assert '<span class="label">Field A</span>\n    \n    <span class="value">a</span>' in result

  		




  1386
  
  
    
    assert '<span class="label">Field B</span>\n    \n    <span class="value">yes</span>' in result

  		




  1387
  
  
    
    assert '<span class="label">Field C</span>\n    \n    <span class="value">Sept. 28, 2020</span>' in result

  		




  1388
  
  
    
    assert '<span class="label">Related</span>\n    \n    <span class="value">Foo Bar</span>' in result

  		




  
  1389
  
    
    assert '<span class="label">Field A</span><span class="value">a</span>' in result

  		




  
  1390
  
    
    assert '<span class="label">Field B</span><span class="value">yes</span>' in result

  		




  
  1391
  
    
    assert '<span class="label">Field C</span><span class="value">Sept. 28, 2020</span>' in result

  		




  
  1392
  
    
    assert (

  		




  
  1393
  
    
        '<span class="label">Field D</span><span class="value"><a href="http://some-url.com/download?f=42">'

  		




  
  1394
  
    
        '<img src="http://some-url.com/download?f=42&thumbnail=1" /><span>file.pdf</span></a></span>'

  		




  
  1395
  
    
    ) in result

  		




  
  1396
  
    
    assert '<span class="label">Related</span><span class="value">Foo Bar</span>' in result

  		




  1389
  1397
  
    
    assert 'related_raw' not in result

  		




  1390
  1398
  
    
    assert 'related_structured' not in result

  		




  1391
  1399
  
    

  		




  1392
  
  
    
-