arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-02-14 10:39:41 +00:00
Code Issues Projects Releases Wiki Activity

Fix the modal fuckery

Browse Source
This commit is contained in:
FreneticScribbler
2021-10-20 20:15:13 +01:00
parent 0a0c9f15af
commit 10326f884f
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
training/templates/trainee_detail.html
View File

@@ -71,7 +71,7 @@
</div> </div>
{% if forloop.last %}</div>{%endif%} {% if forloop.last %}</div>{%endif%}
{% empty %} {% 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 %} {% endfor %}
<div class="card-columns"> <div class="card-columns">
{% for level in started_levels %} {% for level in started_levels %}

13
training/views.py
View File

@@ -22,7 +22,7 @@ class ItemList(generic.ListView):
return context return context
class TraineeDetail(views.ProfileDetail, ModalURLMixin): class TraineeDetail(views.ProfileDetail):
template_name = "trainee_detail.html" template_name = "trainee_detail.html"
model = models.Trainee model = models.Trainee
@@ -41,9 +41,6 @@ class TraineeDetail(views.ProfileDetail, ModalURLMixin):
context[str(i)] = self.object.get_records_of_depth(i) context[str(i)] = self.object.get_records_of_depth(i)
return context return context
def get_success_url(self):
return self.get_close_url('trainee_detail', 'trainee_detail')
class TraineeItemDetail(generic.ListView): class TraineeItemDetail(generic.ListView):
model = models.TrainingItemQualification model = models.TrainingItemQualification
@@ -90,7 +87,7 @@ class SessionLog(generic.FormView):
return context return context
class AddQualification(generic.CreateView): class AddQualification(generic.CreateView, ModalURLMixin):
template_name = "edit_training_record.html" template_name = "edit_training_record.html"
model = models.TrainingItemQualification model = models.TrainingItemQualification
form_class = forms.QualificationForm form_class = forms.QualificationForm
@@ -106,7 +103,7 @@ class AddQualification(generic.CreateView):
return context return context
def get_success_url(self): 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): def get_form_kwargs(self):
kwargs = super(AddQualification, self).get_form_kwargs() kwargs = super(AddQualification, self).get_form_kwargs()
@@ -114,7 +111,7 @@ class AddQualification(generic.CreateView):
return kwargs return kwargs
class AddLevelRequirement(generic.CreateView): class AddLevelRequirement(generic.CreateView, ModalURLMixin):
template_name = "edit_training_level.html" template_name = "edit_training_level.html"
model = models.TrainingLevelRequirement model = models.TrainingLevelRequirement
form_class = forms.RequirementForm form_class = forms.RequirementForm
@@ -130,7 +127,7 @@ class AddLevelRequirement(generic.CreateView):
return kwargs return kwargs
def get_success_url(self): 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() @transaction.atomic()
@reversion.create_revision() @reversion.create_revision()