Enhance case search functionality: display recent cases in search results and adjust initial load behavior
This commit is contained in:
+23
-4
@@ -1173,12 +1173,18 @@ def add_case_to_collection(request, collection_id):
|
||||
|
||||
# if request.method == "POST":
|
||||
|
||||
cases = get_cases_available_to_user(request.user)
|
||||
# don't show search results on initial load; the search partial will render only when a query exists
|
||||
cases = Case.objects.none()
|
||||
|
||||
# Also compute recent cases for initial display (authored by current user and not in collection)
|
||||
recent_qs = get_cases_available_to_user(request.user).filter(author=request.user)
|
||||
recent_qs = recent_qs.exclude(pk__in=collection.cases.values_list("pk", flat=True))
|
||||
recent_cases = recent_qs.order_by("-created_date")[:5]
|
||||
|
||||
return render(
|
||||
request,
|
||||
"atlas/add_case_to_collection.html",
|
||||
{"cases": cases, "collection": collection},
|
||||
{"cases": cases, "collection": collection, "recent_cases": recent_cases, "q": ""},
|
||||
)
|
||||
|
||||
|
||||
@@ -1201,9 +1207,22 @@ def case_search(request):
|
||||
if q:
|
||||
qs = qs.filter(title__icontains=q)
|
||||
|
||||
cases = qs.order_by("title")[:30]
|
||||
# Recent cases: last 5 created that are available to the user and not already in the collection
|
||||
# Restrict recent cases to those authored by the current user and not already in the collection
|
||||
recent_qs = get_cases_available_to_user(request.user).filter(author=request.user)
|
||||
if collection is not None:
|
||||
recent_qs = recent_qs.exclude(pk__in=collection.cases.values_list("pk", flat=True))
|
||||
recent_cases = recent_qs.order_by("-created_date")[:5]
|
||||
|
||||
return render(request, "atlas/partials/case_search_results.html", {"cases": cases, "collection": collection})
|
||||
# Exclude recent cases from the main search results to avoid duplication
|
||||
recent_pks = [c.pk for c in recent_cases]
|
||||
cases = qs.exclude(pk__in=recent_pks).order_by("title")[:30]
|
||||
|
||||
return render(
|
||||
request,
|
||||
"atlas/partials/case_search_results.html",
|
||||
{"cases": cases, "collection": collection, "recent_cases": recent_cases, "q": q},
|
||||
)
|
||||
|
||||
|
||||
@login_required
|
||||
|
||||
Reference in New Issue
Block a user