From 471925332487184779dcf047fd9a60dff4015a3a Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sun, 26 Jun 2022 23:10:41 +0100
Subject: [PATCH] .

---
 atlas/templates/atlas/base.html                     |  2 +-
 .../templates/atlas/collection_case_view_take.html  |  2 +-
 atlas/views.py                                      | 13 +++++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/atlas/templates/atlas/base.html b/atlas/templates/atlas/base.html
index ca8c36fe..f3d008ba 100755
--- a/atlas/templates/atlas/base.html
+++ b/atlas/templates/atlas/base.html
@@ -17,9 +17,9 @@
 {% block navigation %}
     Atlas:
     {% if request.user.is_authenticated %}
+        <a href="{% url 'atlas:collection_view' %}">Collections</a> /
         <a href="{% url 'atlas:case_view' %}">Cases</a> /
         <a href="{% url 'atlas:series_view' %}">Series</a> /
-        <a href="{% url 'atlas:collection_view' %}">Collections</a> /
         <a href="{% url 'atlas:categories_list' %}">Categories</a> /
         <a href="{% url 'atlas:case_create' %}" title="Create a new atlas case">Create Case</a> /
         <a href="{% url 'atlas:series_create' %}" title="Create a new image series">Create Series</a>
diff --git a/atlas/templates/atlas/collection_case_view_take.html b/atlas/templates/atlas/collection_case_view_take.html
index 0f0ff16e..1db70a49 100644
--- a/atlas/templates/atlas/collection_case_view_take.html
+++ b/atlas/templates/atlas/collection_case_view_take.html
@@ -82,7 +82,7 @@
         {% endif %}
         {% if next %}
             <button type="submit" name="next" class="save btn btn-default">Next</button>
-        {% else %}
+        {% elif collection.collection_type == "REP" %}
             {% if not exam.publish_results %}
                 <button type="submit" name="save" class="save btn btn-default">Save</button>
             {% endif %}
diff --git a/atlas/views.py b/atlas/views.py
index 51928ede..0d75b619 100755
--- a/atlas/views.py
+++ b/atlas/views.py
@@ -1278,20 +1278,25 @@ def collection_case_view_take(request, pk, case_number, cid, passcode):
                 cid_user_exam.save()
 
         kwargs = {"pk": pk, "cid": cid, "passcode": passcode}
+        redirect_url = "atlas:collection_case_view_take"
+
+        if cid is None:
+            kwargs = {"pk": pk}
+            redirect_url = "atlas:collection_case_view_review"
 
         if "next" in request.POST:
             return redirect(
-                "atlas:collection_case_view_take", case_number=case_number + 1, **kwargs
+                redirect_url, case_number=case_number + 1, **kwargs
             )
         elif "previous" in request.POST:
             return redirect(
-                "atlas:collection_case_view_take", case_number=case_number - 1, **kwargs
+                redirect_url, case_number=case_number - 1, **kwargs
             )
         elif "finish" in request.POST:
-            return redirect("atlas:collection_take_overview", **kwargs)
+            return redirect(redirect_url, **kwargs)
         elif "goto" in request.POST:
             return redirect(
-                "atlas:collection_case_view_take",
+                redirect_url,
                 case_number=int(request.POST.get("goto")),
                 **kwargs,
             )