Self hosted FLOSS fitness/workout, nutrition and weight tracker
Rename url
Roland Geiderda989c437f0b
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.htmlindex 8bf696e38..3c5554e36 100644--- a/wger/core/templates/navigation.html+++ b/wger/core/templates/navigation.html@@ -40,7 +40,7 @@{% if user.is_authenticated %}<li><a class="dropdown-item"- href="{% url 'manager:workout:calendar' %}"+ href="{% url 'manager:routine:calendar' %}"rel="nofollow">{% translate "Calendar" %}</a>diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.htmlindex ff659667e..b1e3aefb0 100644--- a/wger/core/templates/user/overview.html+++ b/wger/core/templates/user/overview.html@@ -67,7 +67,7 @@<h4>{% translate "Log" %} <small>({% blocktranslate with number=10 %}last {{ number }}{% endblocktranslate %})</small></h4>{% if perms.gym.gym_trainer %}-<a href="{{trainer_login}}?next={% url 'manager:workout:calendar' %}" class="btn btn-light btn-sm">{% translate "Calendar" %}</a>+<a href="{{trainer_login}}?next={% url 'manager:routine:calendar' %}" class="btn btn-light btn-sm">{% translate "Calendar" %}</a>{% endif %}<table class="table">@@ -217,7 +217,7 @@{% endif %}<adata-url="{% url 'gym:gym:reset-user-password' current_user.pk %}"- data-bs-toggle="modal"+ data-bs-toggle="modal"data-bs-target="#confirmation-modal"class="dropdown-item">{% translate "Reset user password" %}diff --git a/wger/manager/tests/test_ical.py b/wger/manager/tests/test_ical.pyindex 5182c8306..4db3e3117 100644--- a/wger/manager/tests/test_ical.py+++ b/wger/manager/tests/test_ical.py@@ -32,10 +32,10 @@ class WorkoutICalExportTestCase(WgerTestCase):Helper function"""- response = self.client.get(reverse('manager:workout:ical', kwargs={'pk': 3}))+ response = self.client.get(reverse('manager:routine:ical', kwargs={'pk': 3}))if fail:- self.assertIn(response.status_code, (403, 404, 302))+ self.assertIn(response.status_code, (403, 404))else:self.assertEqual(response.status_code, 200)self.assertEqual(response['Content-Type'], 'text/calendar')diff --git a/wger/manager/urls.py b/wger/manager/urls.pyindex 0c6e5c791..3bf45a3ae 100644--- a/wger/manager/urls.py+++ b/wger/manager/urls.py@@ -17,10 +17,7 @@# Djangofrom django.conf.urls import include-from django.urls import (- path,- re_path,-)+from django.urls import path# wgerfrom wger.core.views.react import ReactView@@ -80,16 +77,7 @@ patterns_workout = [workout.WorkoutMarkAsTemplateView.as_view(),name='make-template',),- path(- 'calendar',- ReactView.as_view(login_required=True),- name='calendar',- ),- path(- '<int:pk>/ical',- ical.export,- name='ical',- ),+]# sub patterns for workouts@@ -124,6 +112,16 @@ patterns_routine = [pdf.workout_view,name='pdf-table',),+ path(+ '<int:pk>/ical',+ ical.export,+ name='ical',+ ),+ path(+ 'calendar',+ ReactView.as_view(login_required=True),+ name='calendar',+ ),]urlpatterns = [