Self hosted FLOSS fitness/workout, nutrition and weight tracker
Allow non-owners to retrieve public routine templates
Roland Geider3515e61d8a24
diff --git a/wger/manager/api/views.py b/wger/manager/api/views.pyindex 3dfe21172..7436d2aa7 100644--- a/wger/manager/api/views.py+++ b/wger/manager/api/views.py@@ -216,6 +216,7 @@ class UserRoutineTemplateViewSet(viewsets.ReadOnlyModelViewSet):"""serializer_class = RoutineSerializer+ permission_classes = [RoutinePermission]is_private = Trueordering_fields = '__all__'filterset_fields = ('name', 'description', 'created')@@ -238,6 +239,7 @@ class PublicRoutineTemplateViewSet(viewsets.ReadOnlyModelViewSet):"""serializer_class = RoutineSerializer+ permission_classes = [RoutinePermission]is_private = Trueordering_fields = '__all__'filterset_fields = ('name', 'description', 'created')diff --git a/wger/manager/tests/test_templates.py b/wger/manager/tests/test_templates.pyindex 578ceab54..b58d4441b 100644--- a/wger/manager/tests/test_templates.py+++ b/wger/manager/tests/test_templates.py@@ -64,3 +64,26 @@ class RoutineTemplatesTestCase(WgerTestCase):self.client.force_login(User.objects.get(username='test'))response = self.client.post(reverse('public-templates-list'), data={})self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)++ def test_public_template_detail_api(self):+ """A public template listed by the API can also be retrieved by a non-owner"""+ self.client.force_login(User.objects.get(username='test'))+ listing = self.client.get(reverse('public-templates-list'))+ template = listing.data['results'][0]+ self.assertNotEqual(Routine.objects.get(pk=template['id']).user.username, 'test')++ response = self.client.get(+ reverse('public-templates-detail', kwargs={'pk': template['id']})+ )+ self.assertEqual(response.status_code, status.HTTP_200_OK)+ self.assertEqual(response.data['id'], template['id'])++ def test_private_template_detail_api(self):+ """The user's own templates can be retrieved"""+ self.client.force_login(User.objects.get(username='test'))+ listing = self.client.get(reverse('templates-list'))+ template = listing.data['results'][0]++ response = self.client.get(reverse('templates-detail', kwargs={'pk': template['id']}))+ self.assertEqual(response.status_code, status.HTTP_200_OK)+ self.assertEqual(response.data['id'], template['id'])