From 41a4e38b1c15a5b0a9b063a069cffa4cac9a6a37 Mon Sep 17 00:00:00 2001 From: Hercilio Ortiz Date: Fri, 21 Mar 2025 19:50:19 -0300 Subject: [PATCH] Bugfix: Add WAGTAILADMIN_BASE_URL in the get_media_item_url function --- grapple/utils.py | 5 ++++- tests/test_blog.py | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/grapple/utils.py b/grapple/utils.py index 6347785d..552c0973 100644 --- a/grapple/utils.py +++ b/grapple/utils.py @@ -279,7 +279,10 @@ def get_media_item_url(cls): url = cls.file.url if url[0] == "/": - return settings.BASE_URL + url + if hasattr(settings, "WAGTAILADMIN_BASE_URL"): + return settings.WAGTAILADMIN_BASE_URL + url + elif hasattr(settings, "BASE_URL"): + return settings.BASE_URL + url return url diff --git a/tests/test_blog.py b/tests/test_blog.py index e5bf00ac..9872c32c 100644 --- a/tests/test_blog.py +++ b/tests/test_blog.py @@ -312,7 +312,7 @@ def test_blog_body_imagechooserblock(self): ) self.assertEqual( query_blocks[count]["image"]["src"], - settings.BASE_URL + block.value.file.url, + settings.WAGTAILADMIN_BASE_URL + block.value.file.url, ) # Increment the count count += 1 @@ -370,7 +370,7 @@ def test_blog_body_imageblock(self): ) self.assertEqual( query_blocks[count]["image"]["src"], - settings.BASE_URL + block.value.file.url, + settings.WAGTAILADMIN_BASE_URL + block.value.file.url, ) self.assertEqual( query_blocks[count]["decorative"], block.value.decorative @@ -487,7 +487,7 @@ def test_blog_body_imagegalleryblock(self): ) self.assertEqual( image["image"]["src"], - settings.BASE_URL + settings.WAGTAILADMIN_BASE_URL + str(block.value["images"][key].value["image"].file.url), ) # Increment the count