Fix Power MIC being lost on RA edit

Why it is subtly different to the Event Update behaviour? Who knows
This commit is contained in:
2020-08-06 10:51:44 +01:00
parent 4514de137a
commit 902476ebab
3 changed files with 6 additions and 5 deletions

View File

@@ -67,7 +67,7 @@ class EventRiskAssessmentDetail(generic.DetailView):
class EventRiskAssessmentList(generic.ListView):
paginate_by = 20
model = models.RiskAssessment
template_name = 'risk_assessment_table.html'
template_name = 'risk_assessment_list.html'
class EventRiskAssessmentReview(generic.View):
@@ -75,6 +75,7 @@ class EventRiskAssessmentReview(generic.View):
rpk = kwargs.get('pk')
ra = models.RiskAssessment.objects.get(pk=rpk)
with reversion.create_revision():
reversion.set_user(self.request.user)
ra.reviewed_by = self.request.user
ra.reviewed_at = timezone.now()
ra.save()

View File

@@ -67,8 +67,8 @@
class="col-sm-8 control-label">{{ form.power_mic.help_text }}</label>
<div class="col-sm-8">
<select id="{{ form.power_mic.id_for_label }}" name="{{ form.power_mic.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
{% if power_mic %}
<option value="{{form.power_mic.value}}" selected="selected" >{{ power_mic.name }}</option>
{% if object.power_mic %}
<option value="{{object.power_mic.pk}}" selected="selected">{{ object.power_mic.name }}</option>
{% endif %}
</select>
</div>

View File

@@ -52,7 +52,7 @@
{% for object in object_list %}
<tr>
{# General #}
<th scope="row"><a href="{% url 'event_detail' object.event.pk %}">{{ object.event }}</a></th>
<th scope="row"><a href="{% url 'event_detail' object.event.pk %}">N{{ object.event.pk|stringformat:"05d" }} {{ object.event.name }}</a></th>
<td class="{% if object.nonstandard_equipment%}bg-danger text-white{%endif%}">{{object.nonstandard_equipment|yesno|title}}</td>
<td class="{% if object.nonstandard_use%}bg-danger text-white{%endif%}">{{object.nonstandard_use|yesno|title}}</td>
<td class="{% if object.contractors%}bg-danger text-white{%endif%}">{{object.contractors|yesno|title}}</td>
@@ -87,7 +87,7 @@
{% if object.reviewed_by %}
Reviewed by <a href="{% url 'profile_detail' object.reviewed_by.pk %}">{{ object.reviewed_by }}</a> at {{ object.reviewed_at }}
{% else %}
<a class="btn btn-success my-3" href="{% url 'ra_review' object.pk %}">Mark Reviewed</a>
<a class="btn btn-success my-2" href="{% url 'ra_review' object.pk %}">Mark Reviewed</a>
{% endif %}
</td>
</tr>