arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-28 19:02:16 +00:00
Code Issues Projects Releases Wiki Activity

More RA fixes

Browse Source
This commit is contained in:
FreneticScribbler
2020-07-02 19:23:43 +01:00
parent b57b918247
commit 721439d095
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
RIGS/models.py
View File

@@ -618,5 +618,8 @@ class RiskAssessment(models.Model):
def activity_feed_string(self): def activity_feed_string(self):
return str(self.event) return str(self.event)
def get_absolute_url(self):
return reverse_lazy('ra_detail', kwargs={'pk': self.pk})
def __str__(self): def __str__(self):
return "%i - %s" % (self.pk, self.event) return "%i - %s" % (self.pk, self.event)

4
RIGS/templates/risk_assessment_detail.html
View File

@@ -49,7 +49,7 @@
</dd> </dd>
<dt class="col-sm-6">{{ object|help_text:'power_mic' }}</dt> <dt class="col-sm-6">{{ object|help_text:'power_mic' }}</dt>
<dd class="col-sm-6"> <dd class="col-sm-6">
{{ object.power_mic.name|default:'Moose' }} {{ object.power_mic.name|default:'None' }}
</dd> </dd>
<dt class="col-sm-6">{{ object|help_text:'generators' }}</dt> <dt class="col-sm-6">{{ object|help_text:'generators' }}</dt>
<dd class="col-sm-6"> <dd class="col-sm-6">
@@ -97,7 +97,7 @@
<dd class="col-sm-6"> <dd class="col-sm-6">
{{ object.known_venue|yesno|title }} {{ object.known_venue|yesno|title }}
</dd> </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"> <dd class="col-sm-6">
{{ object.safe_loading.name|yesno|title }} {{ object.safe_loading.name|yesno|title }}
</dd> </dd>

4
RIGS/templates/risk_assessment_form.html
View File

@@ -3,7 +3,7 @@
{% load static %} {% load static %}
{% load help_text from filters %} {% 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 css %}
{{ block.super }} {{ block.super }}
@@ -29,7 +29,7 @@
{% block content %} {% block content %}
<div class="col-sm-offset-1 col-sm-10"> <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 %} {% if edit %}
<form method="POST" action="{% url 'ra_edit' pk=object.pk %}"> <form method="POST" action="{% url 'ra_edit' pk=object.pk %}">
{% else %} {% else %}