Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Make the gym member export a plain download link

Roland Geider910b217deec3
diff --git a/wger/gym/templates/gym/member_list.html b/wger/gym/templates/gym/member_list.html
index 32b9c7971..60e257d1c 100644
--- a/wger/gym/templates/gym/member_list.html
+++ b/wger/gym/templates/gym/member_list.html
@@ -95,9 +95,9 @@
{% url 'gym:gym:edit' gym.id as url %}
{% modal_link url=url text=text css_class='dropdown-item' %}
- {% translate 'Export' as text %}
- {% url 'gym:export:users' gym.id as url %}
- {% modal_link url=url text=text css_class='dropdown-item' %}
+ <a href="{% url 'gym:export:users' gym.id %}" class="dropdown-item">
+ {% translate 'Export' %}
+ </a>
</div>
</div>
{% endif %}
diff --git a/wger/gym/tests/test_export.py b/wger/gym/tests/test_export.py
index 80ecf82b8..a4d01c6c1 100644
--- a/wger/gym/tests/test_export.py
+++ b/wger/gym/tests/test_export.py
@@ -108,3 +108,21 @@ class GymMembersCsvExportTestCase(WgerTestCase):
('=', '+', '-', '@'),
msg=f'unsanitised formula cell in export: {cell!r}',
)
+
+
+class GymMembersExportLinkTestCase(WgerTestCase):
+ """
+ The export is a file download, the member list must not load it into the page
+ """
+
+ def test_export_link_is_a_plain_download(self):
+ self.user_login('admin')
+ response = self.client.get(reverse('gym:gym:user-list', kwargs={'pk': 1}))
+ self.assertEqual(response.status_code, 200)
+
+ export_url = reverse('gym:export:users', kwargs={'gym_pk': 1})
+ content = response.content.decode()
+ start = content.index(f'href="{export_url}"')
+ link = content[content.rindex('<a', 0, start) : content.index('>', start)]
+
+ self.assertNotIn('hx-get', link)