Self hosted FLOSS fitness/workout, nutrition and weight tracker
Allow anonymous access to the main workout page
Roland Geiderea6cf9e63c6d
diff --git a/wger/manager/templates/mobile/workout/view.html b/wger/manager/templates/mobile/workout/view.htmlindex a6662054d..5f5eeafdc 100644--- a/wger/manager/templates/mobile/workout/view.html+++ b/wger/manager/templates/mobile/workout/view.html@@ -41,7 +41,7 @@ $(document).ready(function() {{% for day in workout.canonical_representation.day_list %}<div id="div-day-{{ day.obj.id }}">- {% render_day day.obj flavour %}+ {% render_day day.obj is_owner %}</div>{% empty %}@@ -55,6 +55,7 @@ $(document).ready(function() {<p style="margin-top:2em;">+ {% if is_owner %}<a href="{% url 'manager:day:add' workout.id %}" {% auto_link_css flavour "wger-modal-dialog" %}>{% trans "Add training day" %}</a>@@ -64,6 +65,7 @@ $(document).ready(function() {{% auto_link_css flavour %}>{% trans "Show/Hide exercise comments" %}</a>+ {% endif %}</p>{% endblock %}@@ -128,6 +130,7 @@ $(document).ready(function() {{% trans "View weight log" %}</a>+{% if is_owner %}<a href="{% url 'manager:workout:edit' workout.id %}" {% auto_link_css flavour "wger-modal-dialog" %}><img src="{% static 'images/icons/edit.svg' %}"width="32"@@ -136,6 +139,7 @@ $(document).ready(function() {title="{% trans 'Edit workout' %}">{% trans "Edit workout" %}</a>+{% endif %}<a href="#export-ical-link" data-toggle="modal" {% auto_link_css flavour %}><img src="{% static 'images/icons/calendar.svg' %}"@@ -146,6 +150,7 @@ $(document).ready(function() {{% trans "Export calendar file" %}</a>+{% if is_owner %}<a href="{% url 'manager:workout:copy' workout.id %}" {% auto_link_css flavour "wger-modal-dialog" %}><img src="{% static 'images/icons/copy.svg' %}"width="32"@@ -162,7 +167,7 @@ $(document).ready(function() {alt="{% trans 'Delete this workout' %}">{% trans "Delete this workout" %}</a>-+{% endif %}<div class="modal fade" id="export-ical-link">diff --git a/wger/manager/templates/workout/view.html b/wger/manager/templates/workout/view.htmlindex ee1243da1..ca05355b1 100644--- a/wger/manager/templates/workout/view.html+++ b/wger/manager/templates/workout/view.html@@ -41,23 +41,26 @@ $(document).ready(function() {{% for day in workout.canonical_representation.day_list %}<div id="div-day-{{ day.obj.id }}">- {% render_day day.obj flavour %}+ {% render_day day.obj is_owner %}</div>{% empty %}- <p>- <a href="{% url 'manager:day:add' workout.id %}" class="wger-modal-dialog btn btn-default btn-block">- {% trans "No days for this workout." %}- {% trans "Add training day" %}- </a>- </p>+ {% if is_owner %}+ <p>+ <a href="{% url 'manager:day:add' workout.id %}" class="wger-modal-dialog btn btn-default btn-block">+ {% trans "No days for this workout." %}+ {% trans "Add training day" %}+ </a>+ </p>+ {% endif %}{% endfor %}-+{% if is_owner %}<p><a href="{% url 'manager:day:add' workout.id %}" class="wger-modal-dialog">{% trans "Add training day" %}</a>|<a id="exercise-comments-toggle" href="{% url 'core:user:preferences' %}">{% trans "Show/Hide exercise comments" %}</a></p>+{% endif %}{% endblock %}@@ -124,6 +127,7 @@ $(document).ready(function() {</a></p>+{% if is_owner %}<p><a href="{% url 'manager:workout:edit' workout.id %}"class="wger-modal-dialog">@@ -135,6 +139,7 @@ $(document).ready(function() {{% trans "Edit workout" %}</a></p>+{% endif %}<p><a data-toggle="modal" data-target="#export-ical-popup">@@ -147,6 +152,7 @@ $(document).ready(function() {</a></p>+{% if is_owner %}<p><a href="{% url 'manager:workout:copy' workout.id %}"class="wger-modal-dialog">@@ -169,7 +175,7 @@ $(document).ready(function() {{% trans "Delete this workout" %}</a></p>-+{% endif %}<div class="modal fade" id="export-ical-popup"><div class="modal-dialog">diff --git a/wger/manager/tests/test_workout.py b/wger/manager/tests/test_workout.pyindex b237b1198..fe69522ee 100644--- a/wger/manager/tests/test_workout.py+++ b/wger/manager/tests/test_workout.py@@ -23,6 +23,48 @@ from wger.manager.tests.testcase import WorkoutManagerDeleteTestCasefrom wger.manager.tests.testcase import WorkoutManagerEditTestCase+class WorkoutAccessTestCase(WorkoutManagerTestCase):+ '''+ Test accessing the workout page+ '''++ def test_access_shared(self):+ '''+ Test accessing the URL of a shared workout+ '''+ workout = Workout.objects.get(pk=1)++ self.user_login('admin')+ response = self.client.get(workout.get_absolute_url())+ self.assertEqual(response.status_code, 200)++ self.user_login('test')+ response = self.client.get(workout.get_absolute_url())+ self.assertEqual(response.status_code, 200)++ self.user_logout()+ response = self.client.get(workout.get_absolute_url())+ self.assertEqual(response.status_code, 200)++ def test_access_not_shared(self):+ '''+ Test accessing the URL of a private workout+ '''+ workout = Workout.objects.get(pk=3)++ self.user_login('admin')+ response = self.client.get(workout.get_absolute_url())+ self.assertEqual(response.status_code, 403)++ self.user_login('test')+ response = self.client.get(workout.get_absolute_url())+ self.assertEqual(response.status_code, 200)++ self.user_logout()+ response = self.client.get(workout.get_absolute_url())+ self.assertEqual(response.status_code, 403)++class AddWorkoutTestCase(WorkoutManagerTestCase):'''Tests adding a Workoutdiff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.pyindex df8b94992..2156cbab8 100644--- a/wger/manager/views/workout.py+++ b/wger/manager/views/workout.py@@ -20,7 +20,7 @@ import datetimefrom django.shortcuts import renderfrom django.shortcuts import get_object_or_404-from django.http import HttpResponseRedirect+from django.http import HttpResponseRedirect, HttpResponseForbiddenfrom django.core.context_processors import csrffrom django.core.urlresolvers import reversefrom django.core.urlresolvers import reverse_lazy@@ -66,14 +66,18 @@ def overview(request):return render(request, 'workout/overview.html', template_data)-@login_requireddef view(request, pk):'''Show the workout with the given ID'''template_data = {}- user = request.user- workout = get_object_or_404(Workout, pk=pk, user=user)+ workout = get_object_or_404(Workout, pk=pk)+ user = workout.user+ is_owner = request.user == user++ if not is_owner and not user.userprofile.ro_access:+ return HttpResponseForbidden()+canonical = workout.canonical_representationuid, token = make_token(user)@@ -97,6 +101,7 @@ def view(request, pk):template_data['muscle_backgrounds_back'] = muscles_backtemplate_data['uid'] = uidtemplate_data['token'] = token+ template_data['is_owner'] = is_ownerreturn render(request, 'workout/view.html', template_data)