This commit is contained in:
Ross
2021-10-25 11:10:38 +01:00
parent 4c02146c31
commit a62a778db8
6 changed files with 53 additions and 17 deletions
+9 -9
View File
@@ -34,7 +34,7 @@ from .forms import (
ExaminationForm,
MarkAnatomyQuestionForm,
AnatomyQuestionForm,
Structure2Form,
StructureForm,
ExamForm,
)
from .models import (
@@ -42,7 +42,7 @@ from .models import (
BodyPart,
CidUserAnswer,
# Examination,
Structure2,
Structure,
Exam,
Answer,
# HalfMarkAnswers,
@@ -872,7 +872,7 @@ def get_examination_id(request):
@login_required
def create_structure(request):
form = Structure2Form(request.POST or None)
form = StructureForm(request.POST or None)
if form.is_valid():
instance = form.save()
return HttpResponse(
@@ -880,7 +880,7 @@ def create_structure(request):
% (instance.pk, instance)
)
return render(
request, "anatomy/create_simple.html", {"form": form, "name": "Structure2"}
request, "anatomy/create_simple.html", {"form": form, "name": "Structure"}
)
@@ -888,7 +888,7 @@ def create_structure(request):
def get_structure_id(request):
if request.is_ajax():
structure_name = request.GET["structure_name"]
structure_id = Structure2.objects.get(name=structure_name).id
structure_id = Structure.objects.get(name=structure_name).id
data = {
"structure_id": structure_id,
}
@@ -1003,20 +1003,20 @@ class ExamClone(ExamCloneMixin, ExamCreate):
"""Clone exam view"""
class Structure2Autocomplete(autocomplete.Select2QuerySetView):
class StructureAutocomplete(autocomplete.Select2QuerySetView):
def get_queryset(self):
# Don't forget to filter out results depending on the visitor !
if not self.request.user.is_authenticated:
return Structure2.objects.none()
return Structure.objects.none()
qs = Structure2.objects.all()
qs = Structure.objects.all()
if self.q:
# This raises a fielderror which breaks creating a new item if not caught
try:
qs = qs.filter(name__istartswith=self.q)
except FieldError:
return Structure2.objects.none()
return Structure.objects.none()
return qs