From 721439d09523b2c9b2fb50981f9240123a0edced Mon Sep 17 00:00:00 2001
From: Arona Jones <aj@aronajones.com>
Date: Thu, 2 Jul 2020 19:23:43 +0100
Subject: [PATCH] More RA fixes

---
 RIGS/models.py                             | 3 +++
 RIGS/templates/risk_assessment_detail.html | 8 ++++----
 RIGS/templates/risk_assessment_form.html   | 6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/RIGS/models.py b/RIGS/models.py
index 61397f1e..8b766edd 100644
--- a/RIGS/models.py
+++ b/RIGS/models.py
@@ -618,5 +618,8 @@ class RiskAssessment(models.Model):
     def activity_feed_string(self):
         return str(self.event)
 
+    def get_absolute_url(self):
+        return reverse_lazy('ra_detail', kwargs={'pk': self.pk})
+
     def __str__(self):
         return "%i - %s" % (self.pk, self.event)
diff --git a/RIGS/templates/risk_assessment_detail.html b/RIGS/templates/risk_assessment_detail.html
index 363fad12..98483ca3 100644
--- a/RIGS/templates/risk_assessment_detail.html
+++ b/RIGS/templates/risk_assessment_detail.html
@@ -36,7 +36,7 @@
                         <dd class="col-2">
                             {{ object.general_notes|default:'N/A'|linebreaks }}
                         </dd>
-                    </dl> 
+                    </dl>
                 </div>
             </div>
             <div class="card card-default mb-3">
@@ -49,7 +49,7 @@
                         </dd>
                         <dt class="col-sm-6">{{ object|help_text:'power_mic' }}</dt>
                         <dd class="col-sm-6">
-                            {{ object.power_mic.name|default:'Moose' }}
+                            {{ object.power_mic.name|default:'None' }}
                         </dd>
                         <dt class="col-sm-6">{{ object|help_text:'generators' }}</dt>
                         <dd class="col-sm-6">
@@ -72,7 +72,7 @@
                             {{ object.power_notes|default:'N/A'|linebreaks }}
                         </dd>
                     </dl>
-                </div>     
+                </div>
             </div>
             <div class="card card-default mb-3">
                 <div class="card-header">Sound</div>
@@ -97,7 +97,7 @@
                         <dd class="col-sm-6">
                             {{ object.known_venue|yesno|title }}
                         </dd>
-                        <dt class="col-sm-6">{{ object|help_text:'safe_loading' }}</dt>
+                        <dt class="col-sm-6">{{ object|help_text:'safe_loading'|safe }}</dt>
                         <dd class="col-sm-6">
                             {{ object.safe_loading.name|yesno|title }}
                         </dd>
diff --git a/RIGS/templates/risk_assessment_form.html b/RIGS/templates/risk_assessment_form.html
index 6fe7bcff..b65c681d 100644
--- a/RIGS/templates/risk_assessment_form.html
+++ b/RIGS/templates/risk_assessment_form.html
@@ -3,7 +3,7 @@
 {% load static %}
 {% load help_text from filters %}
 
-{% block title %}{% if edit %}Edit{% else %}Create{% endif %} Risk Assessment for Event N{{ event.pk|stringformat:"05d" }}{% endblock %}
+{% block title %}{% if edit %}Edit{% else %}Create{% endif %} Risk Assessment for Event N{{ object.event.pk|stringformat:"05d" }} {{ object.event.name }}{% endblock %}
 
 {% block css %}
     {{ block.super }}
@@ -29,7 +29,7 @@
 
 {% block content %}
     <div class="col-sm-offset-1 col-sm-10">
-        <h3>{% if edit %}Edit{% else %}Create{% endif %} Risk Assessment for Event N{{ event.pk|stringformat:"05d" }}</h3>
+        <h3>{% if edit %}Edit{% else %}Create{% endif %} Risk Assessment for Event N{{ object.event.pk|stringformat:"05d" }} {{ object.event.name }}</h3>
         {% if edit %}
         <form method="POST" action="{% url 'ra_edit' pk=object.pk %}">
         {% else %}
@@ -47,7 +47,7 @@
                             {% include 'partials/yes_no_radio.html' with formitem=form.contractors %}
                             {% include 'partials/yes_no_radio.html' with formitem=form.other_companies %}
                             {% include 'partials/yes_no_radio.html' with formitem=form.crew_fatigue %}
-                            
+
                             <label for="{{ form.general_notes.id_for_label }}">{{ form.general_notes.help_text }}</label>
                             {% render_field form.general_notes class+="form-control" %}
                         </div>