entrouvert
/
combo
16
1
Fork 0
Code Issues Pull Requests 12 Releases Wiki Activity

wcs: add trailing / to card page urls to avoid redirect (#68534)

This commit is contained in:
Lauréline Guérin 2022-08-30 11:52:05 +02:00
parent bf62d743a5
commit 8cdbd1c0e7
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
combo/apps/wcs/__init__.py
View File

@ -79,7 +79,7 @@ class AppConfig(django.apps.AppConfig):
'custom_views': card.get('custom_views') or [],
'label': label,
'signature': True,
'hit_url_template': card_page_base_url + '{{ id }}',
'hit_url_template': '%s{{ id }}/' % card_page_base_url,
'hit_label_template': '{% firstof digest text %}',
}
return engines

2
combo/apps/wcs/templates/combo/wcs/cards.html
View File

@ -12,7 +12,7 @@
<ul>
{% for data in card_objects %}
<li>
<a href="{% if card_page_base_url %}{{ card_page_base_url }}{{ data.id }}{% else %}{{ data.url }}{% endif %}"><span class="card-title">{{ data.text }}</span></a>
<a href="{% if card_page_base_url %}{{ card_page_base_url }}{{ data.id }}/{% else %}{{ data.url }}{% endif %}"><span class="card-title">{{ data.text }}</span></a>
</li>
{% endfor %}
</ul>

2
tests/test_search.py
View File

@ -931,7 +931,7 @@ def test_wcs_search_engines(settings, app):
'{% if search_service.selected_custom_view %}{{ search_service.selected_custom_view }}{% endif %}'
'?{% if not search_service.without_user %}NameID={{ user_nameid }}&{% endif %}q=%(q)s'
)
assert card_engine['hit_url_template'] == '/bar/{{ id }}'
assert card_engine['hit_url_template'] == '/bar/{{ id }}/'
def test_wcs_errors(settings, app):

12
tests/wcs/test_card.py
View File

@ -683,9 +683,9 @@ def test_card_cell_table_mode_render(mock_send, context, app):
result = cell.render(context)
assert '<h2>Card Model 1</h2>' in result
assert '<a href="/foo/11"><span class="card-title">aa</span></a>' in result
assert '<a href="/foo/12"><span class="card-title">bb</span></a>' in result
assert '<a href="/foo/13"><span class="card-title">cc</span></a>' in result
assert '<a href="/foo/11/"><span class="card-title">aa</span></a>' in result
assert '<a href="/foo/12/"><span class="card-title">bb</span></a>' in result
assert '<a href="/foo/13/"><span class="card-title">cc</span></a>' in result
cell.carddef_reference = 'default:card_model_1:foo'
cell.limit = 42
@ -695,9 +695,9 @@ def test_card_cell_table_mode_render(mock_send, context, app):
result = cell.render(context)
assert '<h2>Card Model 1</h2>' in result
assert '<a href="/foo/11"><span class="card-title">aa</span></a>' in result
assert '<a href="/foo/12"><span class="card-title">bb</span></a>' in result
assert '<a href="/foo/13"><span class="card-title">cc</span></a>' not in result
assert '<a href="/foo/11/"><span class="card-title">aa</span></a>' in result
assert '<a href="/foo/12/"><span class="card-title">bb</span></a>' in result
assert '<a href="/foo/13/"><span class="card-title">cc</span></a>' not in result
assert 'data-paginate-by="42"' in result
with mock.patch('combo.apps.wcs.models.requests.get') as requests_get: