Enhance user experience by adding informative messages and edit mode functionality across various templates
This commit is contained in:
+9
-2
@@ -11,6 +11,7 @@ from django.utils import timezone
|
||||
from django.views.decorators.http import require_POST
|
||||
from django.views.decorators.http import require_http_methods
|
||||
from django.template.loader import render_to_string
|
||||
from django.db.models import Count
|
||||
|
||||
# from django.contrib.auth.models import User
|
||||
from django.contrib.auth.decorators import login_required, user_passes_test
|
||||
@@ -211,6 +212,7 @@ def case_displaysets(request, pk):
|
||||
|
||||
# Get displayset id from GET parameter
|
||||
displayset_id = request.GET.get("displayset")
|
||||
edit = request.GET.get("edit", False)
|
||||
selected_displayset = None
|
||||
if displayset_id:
|
||||
try:
|
||||
@@ -223,6 +225,7 @@ def case_displaysets(request, pk):
|
||||
"atlas/case_displaysets.html",
|
||||
{
|
||||
"case": case,
|
||||
"edit": edit,
|
||||
"can_edit": can_edit,
|
||||
"selected_displayset": selected_displayset,
|
||||
},
|
||||
@@ -2029,8 +2032,12 @@ def collection_detail(request, pk):
|
||||
collection = get_object_or_404(CaseCollection, pk=pk)
|
||||
|
||||
# cases = collection.cases.all().order_by("casedetail__sort_order")
|
||||
casedetails = CaseDetail.objects.filter(collection=collection).order_by(
|
||||
"sort_order"
|
||||
casedetails = (
|
||||
CaseDetail.objects
|
||||
.filter(collection=collection)
|
||||
.select_related("case")
|
||||
.annotate(series_count=Count("case__seriesdetail"))
|
||||
.order_by("sort_order")
|
||||
)
|
||||
|
||||
return render(
|
||||
|
||||
Reference in New Issue
Block a user