No uploads matched that hash.
+ No pending uploads matched that hash.
+ {% endif %}
+
+ No imported Atlas images matched that hash.
{% endif %}
{% else %}
Enter a hash value to search uploads.
diff --git a/atlas/templates/atlas/user_uploads.html b/atlas/templates/atlas/user_uploads.html
index 73d7470f..bdabe51c 100644
--- a/atlas/templates/atlas/user_uploads.html
+++ b/atlas/templates/atlas/user_uploads.html
@@ -5,9 +5,6 @@
Series imported from here will be orphaned (not associated with a case).
It is usually better to
create a case first and then import directly into the case.
diff --git a/atlas/views.py b/atlas/views.py
index fd58ffc4..4c3e2b49 100755
--- a/atlas/views.py
+++ b/atlas/views.py
@@ -2015,24 +2015,34 @@ def all_uploads(request, case_id: int | None = None):
@staff_member_required
def uploads_hash_search(request):
query = (request.GET.get("hash") or "").strip().lower()
- dicoms = UncategorisedDicom.objects.none()
+ uploads_qs = UncategorisedDicom.objects.none()
+ imported_qs = SeriesImage.objects.none()
if query:
- dicoms = UncategorisedDicom.objects.filter(
+ uploads_qs = UncategorisedDicom.objects.filter(
image_blake3_hash__icontains=query
).select_related("user", "series").order_by("-created_date")
+ imported_qs = SeriesImage.objects.filter(
+ image_blake3_hash__icontains=query
+ ).select_related("series").order_by("-pk")
- paginator = Paginator(dicoms, 50)
- page_number = request.GET.get("page")
- page_obj = paginator.get_page(page_number)
+ uploads_paginator = Paginator(uploads_qs, 50)
+ uploads_page_number = request.GET.get("uploads_page")
+ uploads_page_obj = uploads_paginator.get_page(uploads_page_number)
+
+ imported_paginator = Paginator(imported_qs, 50)
+ imported_page_number = request.GET.get("imported_page")
+ imported_page_obj = imported_paginator.get_page(imported_page_number)
return render(
request,
"atlas/uploads_hash_search.html",
{
"hash_query": query,
- "page_obj": page_obj,
- "result_count": paginator.count,
+ "uploads_page_obj": uploads_page_obj,
+ "uploads_result_count": uploads_paginator.count,
+ "imported_page_obj": imported_page_obj,
+ "imported_result_count": imported_paginator.count,
},
)
diff --git a/rad.code-workspace b/rad.code-workspace
index 24a0bd0b..feb2c722 100644
--- a/rad.code-workspace
+++ b/rad.code-workspace
@@ -10,6 +10,12 @@
"."
],
"python.testing.unittestEnabled": false,
- "python.testing.pytestEnabled": true
+ "python.testing.pytestEnabled": true,
+ "chat.tools.terminal.autoApprove": {
+ "/^source \\.venv/bin/activate\\.fish && python manage\\.py check$/": {
+ "approve": true,
+ "matchCommandLine": true
+ }
+ }
}
}
\ No newline at end of file