Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Allow anonymous access to the workout log page

Roland Geiderb7a376b8a713
diff --git a/wger/manager/templates/workout/log.html b/wger/manager/templates/workout/log.html
index 6cc4a985f..e48bf28c9 100644
--- a/wger/manager/templates/workout/log.html
+++ b/wger/manager/templates/workout/log.html
@@ -23,6 +23,7 @@ $(document).ready(function() {
{% for day in workout.canonical_representation.day_list %}
<h3>{{ day.obj.description }}</h3>
+ {% if is_owner %}
<p>
<a href="{% url 'manager:day:log' day.obj.id %}"
title="{% trans 'Add weight log to this day' %}"
@@ -34,6 +35,7 @@ $(document).ready(function() {
{% trans 'Add weight log to this day' %}
</a>
</p>
+ {% endif %}
{% for set in day.set_list %}
{% for exercise in set.exercise_list %}
@@ -47,7 +49,7 @@ $(document).ready(function() {
{% if exercise_list.log_by_date %}
{% with list=exercise_list.log_by_date %}
- {% render_weight_log list exercise_list.div_uuid user %}
+ {% render_weight_log list exercise_list.div_uuid owner_user %}
<script>
$(document).ready(function() {
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.py
index 7206c1b79..269785eb2 100644
--- a/wger/manager/tests/test_weight_log.py
+++ b/wger/manager/tests/test_weight_log.py
@@ -34,6 +34,48 @@ from wger.utils.helpers import make_uid
logger = logging.getLogger('wger.custom')
+class WeightLogAccessTestCase(WorkoutManagerTestCase):
+ '''
+ Test accessing the weight log page
+ '''
+
+ def test_access_shared(self):
+ '''
+ Test accessing the URL of a shared weight log
+ '''
+ url = reverse('manager:log:log', kwargs={'pk': 1})
+
+ self.user_login('admin')
+ response = self.client.get(url)
+ self.assertEqual(response.status_code, 200)
+
+ self.user_login('test')
+ response = self.client.get(url)
+ self.assertEqual(response.status_code, 200)
+
+ self.user_logout()
+ response = self.client.get(url)
+ self.assertEqual(response.status_code, 200)
+
+ def test_access_not_shared(self):
+ '''
+ Test accessing the URL of a private weight log
+ '''
+ url = reverse('manager:log:log', kwargs={'pk': 3})
+
+ self.user_login('admin')
+ response = self.client.get(url)
+ self.assertEqual(response.status_code, 403)
+
+ self.user_login('test')
+ response = self.client.get(url)
+ self.assertEqual(response.status_code, 200)
+
+ self.user_logout()
+ response = self.client.get(url)
+ self.assertEqual(response.status_code, 403)
+
+
class CalendarAccessTestCase(WorkoutManagerTestCase):
'''
Test accessing the calendar page
@@ -72,19 +114,15 @@ class WeightLogOverviewAddTestCase(WorkoutManagerTestCase):
# Fetch the overview page
response = self.client.get(reverse('manager:log:log', kwargs={'pk': 1}))
- if fail:
- # Logged out users get a 302 redirect to login page
- # Users not owning the workout, a 403, forbidden
- self.assertTrue(response.status_code in (302, 403))
- else:
- self.assertEqual(response.status_code, 200)
- self.assertEqual(response.context['active_tab'], 'workout')
- self.assertEqual(response.context['workout'].id, 1)
+ # All access OK, since user 1 has ro_access = True
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(response.context['active_tab'], 'workout')
+ self.assertEqual(response.context['workout'].id, 1)
# Open the log entry page
response = self.client.get(reverse('manager:day:log', kwargs={'pk': 1}))
if fail:
- self.assertTrue(response.status_code in (302, 403))
+ self.assertIn(response.status_code, (302, 403))
else:
self.assertEqual(response.status_code, 200)
@@ -108,7 +146,7 @@ class WeightLogOverviewAddTestCase(WorkoutManagerTestCase):
# Logged out users get a 302 redirect to login page
# Users not owning the workout, a 403, forbidden
if fail:
- self.assertTrue(response.status_code in (302, 403))
+ self.assertIn(response.status_code, (302, 403))
self.assertEqual(count_before, count_after)
else:
self.assertEqual(response.status_code, 302)
diff --git a/wger/manager/views/log.py b/wger/manager/views/log.py
index 23b42c57f..89fbcc320 100644
--- a/wger/manager/views/log.py
+++ b/wger/manager/views/log.py
@@ -261,6 +261,7 @@ class WorkoutLogDetailView(DetailView, WgerPermissionMixin):
template_name = 'workout/log.html'
login_required = True
context_object_name = 'workout'
+ owner_user = None
def get_context_data(self, **kwargs):
@@ -279,7 +280,7 @@ class WorkoutLogDetailView(DetailView, WgerPermissionMixin):
exercise_id = exercise_list['obj'].id
exercise_log[exercise_id] = []
- logs = exercise_list['obj'].workoutlog_set.filter(user=self.request.user,
+ logs = exercise_list['obj'].workoutlog_set.filter(user=self.owner_user,
workout=self.object)
entry_log, chart_data = process_log_entries(logs)
if entry_log:
@@ -293,6 +294,8 @@ class WorkoutLogDetailView(DetailView, WgerPermissionMixin):
context['workout_log'] = workout_log
context['reps'] = _("Reps")
+ context['owner_user'] = self.owner_user
+ context['is_owner'] = self.owner_user == self.request.user
return context
@@ -301,8 +304,11 @@ class WorkoutLogDetailView(DetailView, WgerPermissionMixin):
Check for ownership
'''
- workout = Workout.objects.get(pk=kwargs['pk'])
- if workout.user != request.user:
+ workout = get_object_or_404(Workout, pk=kwargs['pk'])
+ self.owner_user = workout.user
+ is_owner = request.user == self.owner_user
+
+ if not is_owner and not self.owner_user.userprofile.ro_access:
return HttpResponseForbidden()
# Dispatch normally