.
This commit is contained in:
+10
-14
@@ -65,8 +65,6 @@ from helpers.images import image_as_base64
|
||||
import logging
|
||||
from copy import deepcopy
|
||||
from django.forms.models import model_to_dict
|
||||
from atlas.forms import AtlasCreationDefaultForm
|
||||
from atlas.models import AtlasCreationDefault
|
||||
|
||||
from generic.views import ExamCloneMixin, ExamViews
|
||||
from reversion.views import RevisionMixin
|
||||
@@ -75,8 +73,6 @@ import reversion
|
||||
|
||||
from rest_framework import viewsets
|
||||
|
||||
from .serializers import ExamSerializer
|
||||
|
||||
from zipview.views import BaseZipView
|
||||
|
||||
import os
|
||||
@@ -111,7 +107,7 @@ def case_detail(request, pk):
|
||||
|
||||
@login_required
|
||||
@user_is_author_or_atlas_series_checker_or_atlas_marker
|
||||
def atlas_series_detail(request, pk):
|
||||
def series_detail(request, pk):
|
||||
series = get_object_or_404(Series, pk=pk)
|
||||
|
||||
# if request.user not in atlas.author.all():
|
||||
@@ -468,7 +464,7 @@ def get_examination_id(request):
|
||||
return HttpResponse("/")
|
||||
|
||||
|
||||
class AtlasView(LoginRequiredMixin, SingleTableMixin, FilterView):
|
||||
class CaseView(LoginRequiredMixin, SingleTableMixin, FilterView):
|
||||
model = Case
|
||||
table_class = AtlasTable
|
||||
template_name = "atlas/view.html"
|
||||
@@ -486,19 +482,19 @@ class SeriesView(LoginRequiredMixin, SingleTableMixin, FilterView):
|
||||
|
||||
@login_required
|
||||
@user_is_author_or_atlas_series_checker
|
||||
def atlas_series_order_dicom(request, pk):
|
||||
def series_order_dicom(request, pk):
|
||||
series = get_object_or_404(Series, pk=pk)
|
||||
try:
|
||||
series.order_by_dicom()
|
||||
except:
|
||||
return HttpResponse("<h1>Series does not appear to contain dicoms</h1>")
|
||||
|
||||
return redirect("atlas:atlas_series_detail", pk=pk)
|
||||
return redirect("atlas:series_detail", pk=pk)
|
||||
|
||||
|
||||
@login_required
|
||||
@user_is_author_or_atlas_series_checker
|
||||
def atlas_series_order_dicom_instance(request, pk):
|
||||
def series_order_dicom_instance(request, pk):
|
||||
series = get_object_or_404(Series, pk=pk)
|
||||
try:
|
||||
series.order_by_dicom("InstanceNumber")
|
||||
@@ -507,12 +503,12 @@ def atlas_series_order_dicom_instance(request, pk):
|
||||
"<h1>Series does not appear to contain dicoms (or field InstanceNumber)</h1>"
|
||||
)
|
||||
|
||||
return redirect("atlas:atlas_series_detail", pk=pk)
|
||||
return redirect("atlas:series_detail", pk=pk)
|
||||
|
||||
|
||||
@login_required
|
||||
@user_is_author_or_atlas_series_checker
|
||||
def atlas_series_order_dicom_SeriesInstanceUID(request, pk):
|
||||
def series_order_dicom_SeriesInstanceUID(request, pk):
|
||||
series = get_object_or_404(Series, pk=pk)
|
||||
try:
|
||||
series.order_by_dicom("SeriesInstanceUID")
|
||||
@@ -521,16 +517,16 @@ def atlas_series_order_dicom_SeriesInstanceUID(request, pk):
|
||||
"<h1>Series does not appear to contain dicoms (or field SeriesInstanceUID)</h1>"
|
||||
)
|
||||
|
||||
return redirect("atlas:atlas_series_detail", pk=pk)
|
||||
return redirect("atlas:series_detail", pk=pk)
|
||||
|
||||
|
||||
@login_required
|
||||
@user_is_author_or_atlas_series_checker
|
||||
def atlas_series_order_upload_filename(request, pk):
|
||||
def series_order_upload_filename(request, pk):
|
||||
series = get_object_or_404(Series, pk=pk)
|
||||
series.order_by_upload_filename()
|
||||
|
||||
return redirect("atlas:atlas_series_detail", pk=pk)
|
||||
return redirect("atlas:series_detail", pk=pk)
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user