From 091bdfefbc8f2cafbadad6de80fbd1673f236ad5 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 13 Apr 2022 22:58:31 +0100
Subject: [PATCH] .

---
 atlas/templates/atlas/casecollection_form.html | 2 +-
 atlas/templates/atlas/collection_detail.html   | 2 +-
 atlas/views.py                                 | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/atlas/templates/atlas/casecollection_form.html b/atlas/templates/atlas/casecollection_form.html
index 5fad20fa..e1e43597 100755
--- a/atlas/templates/atlas/casecollection_form.html
+++ b/atlas/templates/atlas/casecollection_form.html
@@ -34,6 +34,7 @@
         <h3>Cases:</h3>
         Add cases here. These can only be added once created (they can also be added to cases on creation). Click and drag to change order.
         <input type="button" value="Add More Cases" id="add_more_case">
+        <input type=button id="case-order-button" title="click and drag to update case order" value="Update case order" />
         <div id="case_formset" class="sortable">
             {% for form in case_formset %}
                 <ul class="no-error case-formset">
@@ -43,7 +44,6 @@
                 </ul>
             {% endfor %}
         </div>
-        <input type=button id="case-order-button" title="click and drag to update case order">Update case order</button>
         {{ case_formset.management_form }}
         <input type="submit" class="submit-button" value="Submit" name="submit">
     </form>
diff --git a/atlas/templates/atlas/collection_detail.html b/atlas/templates/atlas/collection_detail.html
index 403edfba..f3ac26bf 100644
--- a/atlas/templates/atlas/collection_detail.html
+++ b/atlas/templates/atlas/collection_detail.html
@@ -10,7 +10,7 @@
     </div>
     <h3>Cases</h3>
     <ul>
-        {% for case in collection.cases.all %}
+        {% for case in cases %}
             <li><a href="{% url 'atlas:collection_case_view' pk=collection.pk case_number=forloop.counter0 %}">Case {{forloop.counter}}</a>
                 : {{case.title}}
             </li>
diff --git a/atlas/views.py b/atlas/views.py
index a838f3f5..73827367 100755
--- a/atlas/views.py
+++ b/atlas/views.py
@@ -1042,7 +1042,9 @@ class CollectionView(LoginRequiredMixin, SingleTableMixin, FilterView):
 def collection_detail(request, pk):
     collection = get_object_or_404(CaseCollection, pk=pk)
 
-    return render(request, "atlas/collection_detail.html", {"collection": collection})
+    cases = collection.cases.all().order_by("casedetail__sort_order")
+
+    return render(request, "atlas/collection_detail.html", {"collection": collection, "cases": cases})
 
 
 def collection_take(request, pk):