Self hosted FLOSS fitness/workout, nutrition and weight tracker
Correctly make thumnails URL absolute
Roland Geider5998fa440d1f
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.pyindex c75a29f96..b481a2be9 100644--- a/wger/exercises/api/views.py+++ b/wger/exercises/api/views.py@@ -68,6 +68,7 @@ from wger.exercises.models import (from wger.exercises.views.helper import StreamVerbsfrom wger.utils.api_schema import ImageThumbnailsSerializerfrom wger.utils.cache import CacheKeyMapper+from wger.utils.url import make_absolute_urlclass ExerciseViewSet(ModelViewSet):@@ -375,10 +376,10 @@ class ExerciseImageViewSet(ModelViewSet):for alias in aliases.all():t = get_thumbnailer(image.image)thumbnails[alias] = {- 'url': t.get_thumbnail(aliases.get(alias)).url,+ 'url': make_absolute_url(t.get_thumbnail(aliases.get(alias)).url, request),'settings': aliases.get(alias),}- thumbnails['original'] = image.image.url+ thumbnails['original'] = make_absolute_url(image.image.url, request)return Response(thumbnails)def perform_create(self, serializer):diff --git a/wger/exercises/tests/test_exercise_images.py b/wger/exercises/tests/test_exercise_images.pyindex dd052e850..10b0375fe 100644--- a/wger/exercises/tests/test_exercise_images.py+++ b/wger/exercises/tests/test_exercise_images.py@@ -234,6 +234,21 @@ class ExerciseImageThumbnailsApiTestCase(WgerTestCase):self.assertEqual(response.status_code, 404)+ def test_thumbnails_are_absolute_urls(self):+ """Every url in the response includes the host, as everywhere else in the API"""+ image = ExerciseImage(exercise=Translation.objects.get(pk=2).exercise)+ with open('wger/exercises/tests/protestschwein.jpg', 'rb') as image_file:+ image.image.save('protestschwein.jpg', File(image_file))+ image.save()++ response = self.client.get(reverse('exerciseimage-thumbnails', kwargs={'pk': image.pk}))+ self.assertEqual(response.status_code, 200)++ thumbnails = response.json()+ self.assertTrue(thumbnails['original'].startswith('http'))+ for alias in ('small', 'medium'):+ self.assertTrue(thumbnails[alias]['url'].startswith('http'))+# TODO: add POST and DELETE testsclass ExerciseImagesApiTestCase(diff --git a/wger/utils/api_schema.py b/wger/utils/api_schema.pyindex 8da039d1a..417df39de 100644--- a/wger/utils/api_schema.py+++ b/wger/utils/api_schema.py@@ -32,12 +32,9 @@ class ThumbnailsSerializer(serializers.Serializer):class ThumbnailAliasSerializer(serializers.Serializer):"""One generated thumbnail: where it is and the size it was generated for.-- The url is relative to the server, unlike the absolute ones in an image's- ``thumbnails`` field."""- url = serializers.CharField()+ url = serializers.URLField()settings = serializers.DictField()@@ -48,4 +45,4 @@ class ImageThumbnailsSerializer(serializers.Serializer):small = ThumbnailAliasSerializer()medium = ThumbnailAliasSerializer()- original = serializers.CharField()+ original = serializers.URLField()