From ac916247a61689bc32c83a4e6e939458a2489651 Mon Sep 17 00:00:00 2001 From: FreneticScribbler Date: Thu, 12 Nov 2020 12:47:47 +0000 Subject: [PATCH] Allow H&S for non-events --- RIGS/templates/event_detail.html | 10 +++++----- RIGS/templates/partials/hs_details.html | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/RIGS/templates/event_detail.html b/RIGS/templates/event_detail.html index 9f4bf086..d8e9d311 100644 --- a/RIGS/templates/event_detail.html +++ b/RIGS/templates/event_detail.html @@ -71,12 +71,12 @@
{% include 'partials/event_details.html' %}
+ {% if not event.dry_hire %} +
+ {% include 'partials/hs_details.html' %} +
+ {% endif %} {% if event.is_rig %} - {% if not event.dry_hire %} -
- {% include 'partials/hs_details.html' %} -
- {% endif %} {% if event.is_rig and event.internal and perms.RIGS.view_event %}
{% include 'partials/auth_details.html' %} diff --git a/RIGS/templates/partials/hs_details.html b/RIGS/templates/partials/hs_details.html index cd7918be..0decf382 100644 --- a/RIGS/templates/partials/hs_details.html +++ b/RIGS/templates/partials/hs_details.html @@ -6,7 +6,7 @@
Health & Safety Details
Risk Assessment:
- {% include 'partials/hs_status.html' with event=event object=event.riskassessment view='ra_detail' edit='ra_edit' create='event_ra' %} + {% include 'partials/hs_status.html' with event=event object=event.riskassessment view='ra_detail' edit='ra_edit' create='event_ra' review='ra_review' perm=perms.RIGS.review_riskassessment %}
Event Checklists:
{% for checklist in event.checklists.all %}