.
This commit is contained in:
@@ -199,7 +199,13 @@
|
||||
|
||||
|
||||
<p class="pre-whitespace"><b>Previous case:</b> {{ case.previous_case.get_link }}</p>
|
||||
<p class="pre-whitespace"><b>Next case:</b> {{ case.next_case.get_link }}</p>
|
||||
<p class="pre-whitespace"><b>Next case:</b>
|
||||
{% if case.next_case %}
|
||||
{{ case.next_case.get_link }}
|
||||
{% else %}
|
||||
<a href="{% url 'atlas:case_clone_next' case.pk %}">Clone and add next case</a>
|
||||
{% endif %}
|
||||
</p>
|
||||
<div>
|
||||
{% include 'question_notes.html' %}
|
||||
|
||||
|
||||
@@ -306,6 +306,7 @@ urlpatterns = [
|
||||
name="structure_update",
|
||||
),
|
||||
path("structure/create", views.StructureCreate.as_view(), name="structure_create"),
|
||||
path("series/<int:pk>/thumbnail/fail", views.series_thumbnail_fail, name="series_thumbnail_fail"),
|
||||
path("series/<int:pk>/thumbnail", views.series_thumbnail, name="series_thumbnail"),
|
||||
# TODO: case context series viewing (so that we can view series in the context of a case)
|
||||
path("series/<int:pk>", views.series_detail, name="series_detail"),
|
||||
@@ -372,6 +373,7 @@ urlpatterns = [
|
||||
name="case_collection_form",
|
||||
),
|
||||
path("case/<int:pk>/clone", views.AtlasClone.as_view(), name="case_clone"),
|
||||
path("case/<int:pk>/clone/next", views.AtlasCloneNext.as_view(), name="case_clone_next"),
|
||||
# path("verified/", views.verified, name="verified"),
|
||||
# path("all_questions/", views.all_questions, name="all_questions"),
|
||||
path("case/<int:pk>/scrap", views.atlas_scrap, name="case_scrap"),
|
||||
|
||||
+14
-4
@@ -197,13 +197,17 @@ def case_detail(request, pk):
|
||||
# logging.debug(atlas.subspecialty.first().name.all())
|
||||
return render(request, "atlas/case_detail.html", {"case": case})
|
||||
|
||||
@login_required
|
||||
@user_is_author_or_atlas_series_checker_or_atlas_marker_or_open_access
|
||||
def series_thumbnail_fail(request, pk):
|
||||
return series_thumbnail(request, pk=pk, fail_loudly=True)
|
||||
|
||||
@login_required
|
||||
@user_is_author_or_atlas_series_checker_or_atlas_marker_or_open_access
|
||||
def series_thumbnail(request, pk, finding_pk=None):
|
||||
def series_thumbnail(request, pk, fail_loudly=False):
|
||||
series = get_object_or_404(Series, pk=pk)
|
||||
|
||||
thumbnail, _ = series.get_thumbnail(recreate=True)
|
||||
thumbnail, _ = series.get_thumbnail(recreate=True, fail_loudly=fail_loudly)
|
||||
|
||||
return HttpResponse(thumbnail)
|
||||
|
||||
@@ -1115,7 +1119,6 @@ def add_collection_to_case_form(request, case_id):
|
||||
# pk = self.kwargs["pk"]
|
||||
# return reverse("atlas:case_detail", kwargs={"pk": pk})
|
||||
|
||||
|
||||
class AtlasClone(AtlasCreateBase, AuthorOrCheckerRequiredMixin, CreateView):
|
||||
"""Clones a existing atlas"""
|
||||
|
||||
@@ -1138,7 +1141,14 @@ class AtlasClone(AtlasCreateBase, AuthorOrCheckerRequiredMixin, CreateView):
|
||||
else:
|
||||
pass
|
||||
|
||||
initial_data = model_to_dict(old_object, exclude=["id"])
|
||||
initial_data = model_to_dict(old_object, exclude=["id", "previous_case"])
|
||||
return initial_data
|
||||
|
||||
class AtlasCloneNext(AtlasClone):
|
||||
"""Extends AtlasClone to set the previous_case field to the case being cloned"""
|
||||
def get_initial(self):
|
||||
initial_data = super().get_initial()
|
||||
initial_data["previous_case"] = self.kwargs["pk"]
|
||||
return initial_data
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user