From 8279bec4bfeb41935089d9e2d73d96eb202f03fe Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 10 Mar 2016 11:46:28 +0000 Subject: [PATCH 1/2] Removed warning message at top - closes #203 --- templates/base.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/templates/base.html b/templates/base.html index 8bf8b62c..23476432 100644 --- a/templates/base.html +++ b/templates/base.html @@ -144,10 +144,6 @@ {% endif %} {% endblock %} -
- Reminder: Please consider carefully before booking rigs at this moment -
- {% block content %}{% endblock %} From ed552b402a1fadfaa362b74cab656946bb44c3c4 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 10 Mar 2016 11:56:09 +0000 Subject: [PATCH 2/2] Based on event with no MIC - closes #163 --- RIGS/templates/RIGS/event_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RIGS/templates/RIGS/event_detail.html b/RIGS/templates/RIGS/event_detail.html index b5fd1b7a..e68e73bf 100644 --- a/RIGS/templates/RIGS/event_detail.html +++ b/RIGS/templates/RIGS/event_detail.html @@ -151,7 +151,7 @@ {% if object.based_on.is_rig %}N{{ object.based_on.pk|stringformat:"05d" }}{% else %} {{ object.based_on.pk }}{% endif %} - {{ object.base_on.name }} by {{ object.based_on.mic.name }} + {{ object.base_on.name }} {% if object.based_on.mic %}by {{ object.based_on.mic.name }}{% endif %} {% endif %}