From 10326f884f8e72990172d40c9466111104f4b2c8 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Wed, 20 Oct 2021 20:15:13 +0100
Subject: [PATCH] Fix the modal fuckery

---
 training/templates/trainee_detail.html |  2 +-
 training/views.py                      | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/training/templates/trainee_detail.html b/training/templates/trainee_detail.html
index 968773f2..cdb61d94 100644
--- a/training/templates/trainee_detail.html
+++ b/training/templates/trainee_detail.html
@@ -71,7 +71,7 @@
     </div>
     {% if forloop.last %}</div>{%endif%}
     {% empty %}
-    <span class="badge badge-warning">No qualifications in any levels yet...did someone forget to fill out the paperwork?</span>
+    <div class="alert alert-warning">No qualifications in any levels yet...did someone forget to fill out the paperwork?</div>
     {% endfor %}
     <div class="card-columns">
         {% for level in started_levels %}
diff --git a/training/views.py b/training/views.py
index 641c554f..62262705 100644
--- a/training/views.py
+++ b/training/views.py
@@ -22,7 +22,7 @@ class ItemList(generic.ListView):
         return context
 
 
-class TraineeDetail(views.ProfileDetail, ModalURLMixin):
+class TraineeDetail(views.ProfileDetail):
     template_name = "trainee_detail.html"
     model = models.Trainee
 
@@ -41,9 +41,6 @@ class TraineeDetail(views.ProfileDetail, ModalURLMixin):
             context[str(i)] = self.object.get_records_of_depth(i)
         return context
 
-    def get_success_url(self):
-        return self.get_close_url('trainee_detail', 'trainee_detail')
-
 
 class TraineeItemDetail(generic.ListView):
     model = models.TrainingItemQualification
@@ -90,7 +87,7 @@ class SessionLog(generic.FormView):
         return context
 
 
-class AddQualification(generic.CreateView):
+class AddQualification(generic.CreateView, ModalURLMixin):
     template_name = "edit_training_record.html"
     model = models.TrainingItemQualification
     form_class = forms.QualificationForm
@@ -106,7 +103,7 @@ class AddQualification(generic.CreateView):
         return context
 
     def get_success_url(self):
-        return reverse_lazy('trainee_detail', kwargs={"pk": self.object.pk})
+        return self.get_close_url('trainee_detail', 'trainee_detail')
 
     def get_form_kwargs(self):
         kwargs = super(AddQualification, self).get_form_kwargs()
@@ -114,7 +111,7 @@ class AddQualification(generic.CreateView):
         return kwargs
 
 
-class AddLevelRequirement(generic.CreateView):
+class AddLevelRequirement(generic.CreateView, ModalURLMixin):
     template_name = "edit_training_level.html"
     model = models.TrainingLevelRequirement
     form_class = forms.RequirementForm
@@ -130,7 +127,7 @@ class AddLevelRequirement(generic.CreateView):
         return kwargs
 
     def get_success_url(self):
-        return reverse_lazy('level_detail', kwargs={"pk": self.kwargs['pk']})
+        return self.get_close_url('level_detail', 'level_detail')
 
     @transaction.atomic()
     @reversion.create_revision()