assets: display only name wihout link when asset is not defined (#43385)

This commit is contained in:
Lauréline Guérin 2020-06-01 11:06:58 +02:00
parent 5356dbde4e
commit 0e39d59a35
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
3 changed files with 21 additions and 14 deletions

View File

@ -13,7 +13,14 @@
<tbody>
{% for asset in object_list %}
<tr class="{{ asset.css_classes }}" data-href="{{ asset.src }}">
<td>{% if not asset_for_ckeditor %}<a href="{{ asset.src }}">{{ asset.name }}</a>{% else %}{{ asset.name }}{% endif %}</td>
<td>
{% if asset_for_ckeditor %}
{{ asset.name }}
{% elif asset.src %}
<a href="{{ asset.src }}">{{ asset.name }}</a>
{% else %}
{{ asset.name }} <span class="not-defined">({% trans "not defined" %})</span>
{% endif %}
<td>{% if asset.size %}{{ asset.size|filesizeformat }}{% else %}-{% endif %}</td>
<td class="image">{% if asset.is_image %}<img data-href="{{ asset.src }}" src="{{ asset.thumb }}"/>{% endif %}</td>
{% if not asset_for_ckeditor %}

View File

@ -1270,7 +1270,7 @@ def test_asset_slots_management(app, admin_user):
with override_settings(COMBO_ASSET_SLOTS={'collectivity:banner': {'label': 'Banner'}}):
resp = app.get('/manage/assets/')
assert '>Banner<' in resp.text
assert 'Banner <span class="not-defined">' in resp.text
assert '>Delete<' not in resp.text
resp = resp.click('Overwrite')
@ -1301,7 +1301,7 @@ def test_asset_slots_management(app, admin_user):
resp = resp.form.submit()
assert resp.location.endswith('?page=1')
resp = resp.follow()
assert '>Banner<' in resp.text
assert 'Banner <span class="not-defined">' in resp.text
assert '>Delete<' not in resp.text
assert Asset.objects.filter(key='collectivity:banner').count() == 0
@ -1309,7 +1309,7 @@ def test_asset_slots_management(app, admin_user):
with override_settings(COMBO_ASSET_SLOTS={'collectivity:cgu': {'label': 'CGU', 'asset-type': 'document'}}):
resp = app.get('/manage/assets/')
assert '>CGU<' in resp.text
assert 'CGU <span class="not-defined">' in resp.text
assert '>Delete<' not in resp.text
resp = resp.click('Overwrite')
@ -1406,7 +1406,7 @@ def test_serve_asset(settings, app, admin_user):
app = login(app)
resp = app.get('/manage/assets/')
assert '>Banner<' in resp.text
assert 'Banner <span class="not-defined">' in resp.text
assert '>Delete<' not in resp.text
resp = resp.click('Overwrite')
resp.form['upload'] = Upload(
@ -1433,7 +1433,7 @@ def test_serve_asset(settings, app, admin_user):
assert Asset.objects.filter(key='collectivity:banner').count() == 0
resp = app.get('/manage/assets/')
assert '>Banner<' in resp.text
assert 'Banner <span class="not-defined">' in resp.text
assert '>Delete<' not in resp.text
resp = resp.click('Overwrite')
resp.form['upload'] = Upload(

View File

@ -990,10 +990,10 @@ def test_cell_assets(mock_send, settings, app, admin_user):
'wcs_wcsformsofcategorycell': {'logo': {'prefix': 'Logo blabla', 'suffix': 'test'}},
}
resp = app.get('/manage/assets/')
assert u'>Logo — %s<' % cell2.get_label_for_asset() in resp.text
assert u'>Logo blabla — %s<' % cell2.get_label_for_asset() not in resp.text
assert u'>Picture — %s<' % cell1.get_label_for_asset() in resp.text
assert u'>Picture blabla — %s<' % cell1.get_label_for_asset() not in resp.text
assert u'Logo — %s' % cell2.get_label_for_asset() in resp.text
assert u'Logo blabla — %s' % cell2.get_label_for_asset() not in resp.text
assert u'Picture — %s' % cell1.get_label_for_asset() in resp.text
assert u'Picture blabla — %s' % cell1.get_label_for_asset() not in resp.text
# New settings
settings.WCS_CATEGORY_ASSET_SLOTS = {}
settings.WCS_FORM_ASSET_SLOTS = {}
@ -1002,8 +1002,8 @@ def test_cell_assets(mock_send, settings, app, admin_user):
'wcs_wcsformsofcategorycell': {'logo': {'prefix': 'Logo'}},
}
resp = app.get('/manage/assets/')
assert u'>Logo — %s<' % cell2.get_label_for_asset() in resp.text
assert u'>Picture — %s<' % cell1.get_label_for_asset() in resp.text
assert u'Logo — %s' % cell2.get_label_for_asset() in resp.text
assert u'Picture — %s' % cell1.get_label_for_asset() in resp.text
# test suffix
settings.COMBO_CELL_ASSET_SLOTS = {
@ -1011,8 +1011,8 @@ def test_cell_assets(mock_send, settings, app, admin_user):
'wcs_wcsformsofcategorycell': {'logo': {'prefix': 'Logo', 'suffix': 'test'}},
}
resp = app.get('/manage/assets/')
assert u'>Logo — %s (test)<' % cell2.get_label_for_asset() in resp.text
assert u'>Picture — %s (test)<' % cell1.get_label_for_asset() in resp.text
assert u'Logo — %s (test)' % cell2.get_label_for_asset() in resp.text
assert u'Picture — %s (test)' % cell1.get_label_for_asset() in resp.text
def test_tracking_code_search(settings, app, nocache):