Fix error multiple DicomWeb includefield paraemeters

openradx · Jan 2, 2025 · a1f25dd · a1f25dd
1 parent c2f31f5
commit a1f25dd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/adit/dicom_web/views.py b/adit/dicom_web/views.py
@@ -70,7 +70,7 @@ def _extract_query_parameters(
         for key, value in request.GET.items():
             assert isinstance(value, str)
             if key == "includefield":
-                query[value] = ""
+                continue
             else:
                 query[key] = value
 
@@ -82,6 +82,7 @@ def _extract_query_parameters(
             limit_results = int(query.pop("limit"))
 
         query_ds = QueryDataset.from_dict(query)
+        query_ds.ensure_elements(*request.GET.getlist('includefield'))
         return query_ds, limit_results
 
 

diff --git a/adit/selective_transfer/consumers.py b/adit/selective_transfer/consumers.py
@@ -182,7 +182,7 @@ async def _make_query(self, form: SelectiveTransferJobForm, message_id: int) ->
         except (DicomError, RetriableDicomError):
             form_error_response = await self._build_form_error_response(
                 form,
-                "Something went wrong at your requested source."
+                "Something went wrong at your requested source. "
                 "A Dicom Error has occured at the source.",
             )
             await self.send(form_error_response)