Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: include BASE_URL in image file serialization #1093

Merged
merged 9 commits into from
Jun 11, 2024
Merged

fix: include BASE_URL in image file serialization #1093

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b45c295
fix: optionally include subpath in image file serialization
BeritJanssen Jun 10, 2024
f4c12ed
fix: use string formatting for image serialization
BeritJanssen Jun 10, 2024
b043f11
fix: do not prefix API_ROOT for frontend image fetch
BeritJanssen Jun 10, 2024
617ce89
fix: use image serializer for experiment.views
BeritJanssen Jun 10, 2024
0b8a704
fix: remove API_BASE_URL from Footer image fetch
BeritJanssen Jun 10, 2024
6555e9d
fix footer_serializer unit test
BeritJanssen Jun 10, 2024
2294630
fix frontend unit test
BeritJanssen Jun 10, 2024
1b64cf4
fix image serialization in experiment views
BeritJanssen Jun 10, 2024
468ddca
add alt / href test strings to experiment serialization test
BeritJanssen Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/aml/base_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,4 +195,4 @@
}
}

SUBPATH = os.getenv('AML_SUBPATH', None)
SUBPATH = os.getenv('AML_SUBPATH', '')
drikusroor marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion backend/image/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

def serialize_image(image: Image) -> dict:
return {
'file': join(settings.MEDIA_URL, str(image.file)),
'file': join(settings.MEDIA_URL, settings.SUBPATH, str(image.file)),
'href': image.href,
'alt': image.alt,
}
12 changes: 2 additions & 10 deletions backend/theme/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from django_markup.markup import formatter

from image.models import Image
from image.serializers import serialize_image
from theme.models import FooterConfig, HeaderConfig, ThemeConfig


Expand All @@ -14,21 +14,13 @@ def serialize_footer(footer: FooterConfig) -> dict:
'disclaimer': formatter(
footer.disclaimer, filter_name='markdown'),
'logos': [
serialize_logo(logo) for logo in footer.logos.all()
serialize_image(logo) for logo in footer.logos.all()
],
'privacy': formatter(
footer.privacy, filter_name='markdown'),
}


def serialize_logo(logo: Image) -> dict:
return {
'file': join(settings.MEDIA_URL, str(logo.file)),
'href': logo.href,
'alt': logo.alt,
}


def serialize_header(header: HeaderConfig) -> dict:
return {
'nextExperimentButtonText': _('Next experiment'),
Expand Down
Loading