Skip to content

Commit 3546b3b

Browse files
committed
Use get_settings_as_context() instead of just base_url for iviewer placeholder page
1 parent 9df2ae5 commit 3546b3b

1 file changed

Lines changed: 3 additions & 6 deletions

File tree

idr_gallery/views.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -570,11 +570,6 @@ def image_viewer(request, iid, conn=None, **kwargs):
570570
# "mkngff" data is at https://uk1s3.embassy.ebi.ac.uk/bia-integrator-data/pages/idr_ngff_data.html
571571
bia_ngff_id = img_path.split(BIA_URL, 1)[-1].split("/", 1)[0]
572572

573-
if settings.BASE_URL is not None:
574-
base_url = settings.BASE_URL
575-
else:
576-
base_url = request.build_absolute_uri(reverse('index'))
577-
578573
rsp_json = {
579574
"idr_study": idrid_name,
580575
"template": "idr_gallery/archived_image.html",
@@ -587,7 +582,6 @@ def image_viewer(request, iid, conn=None, **kwargs):
587582
"is_zarr": is_zarr,
588583
"download_url": download_url,
589584
"bia_ngff_id": bia_ngff_id,
590-
"base_url": base_url,
591585
}
592586
if image.fileset is not None:
593587
paths = image.getImportedImageFilePaths()
@@ -613,6 +607,9 @@ def image_viewer(request, iid, conn=None, **kwargs):
613607
}
614608
rsp_json["is_pattern"] = paths["client_paths"][0].endswith("pattern")
615609

610+
settings_ctx = get_settings_as_context()
611+
rsp_json = {**rsp_json, **settings_ctx}
612+
616613
return rsp_json
617614

618615

0 commit comments

Comments
 (0)