Merge branch 'master' into markdown

# Conflicts: # RIGS/templates/RIGS/event_detail.html # RIGS/test_unit.py # requirements.txt
2026-02-03 05:42:17 +00:00 · 2020-02-09 21:07:12 +00:00
parent 858b297929 ae151ed45e
commit 6e28476ca3
124 changed files with 4009 additions and 924 deletions
--- a/RIGS/templates/RIGS/activity_feed_data.html
+++ b/RIGS/templates/RIGS/activity_feed_data.html
@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:"base_ajax_nomodal.html,base.html" %}
+{% extends request.is_ajax|yesno:"base_ajax_nomodal.html,base_rigs.html" %}

 {% load static %}
 {% load paginator from filters %}
--- a/RIGS/templates/RIGS/activity_table.html
+++ b/RIGS/templates/RIGS/activity_table.html
@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
 {% load static %}
 {% load paginator from filters %}
 {% load to_class_name from filters %}
--- a/RIGS/templates/RIGS/calendar.html
+++ b/RIGS/templates/RIGS/calendar.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}
 {% load static %}


--- a/RIGS/templates/RIGS/event_archive.html
+++ b/RIGS/templates/RIGS/event_archive.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}
 {% load paginator from filters %}

 {% block title %}Event Archive{% endblock %}
--- a/RIGS/templates/RIGS/event_detail.html
+++ b/RIGS/templates/RIGS/event_detail.html
@@ -1,5 +1,6 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
 {% load markdown_tags %}
+
 {% block title %}{% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %} | {{object.name}}{% endblock %}

 {% block content %}
@@ -123,7 +124,7 @@
                    <dd>&nbsp;</dd>

                    <dt>Event Description</dt>
-                    <dd>{{ event.description|markdown }}</dd>
+                    <dd class="dont-break-out">{{ event.description|markdown }}</dd>

                    <dd>&nbsp;</dd>

@@ -159,7 +160,15 @@
    </div>
    {% if event.is_rig and event.internal %}
    <div class="col-sm-12">
-        <div class="panel panel-default">
+        <div class="panel panel-default
+            {% if object.authorised %}
+                panel-success
+            {% elif event.authorisation and event.authorisation.amount != event.total and event.authorisation.last_edited_at > event.auth_request_at %}
+                panel-warning
+            {% elif event.auth_request_to %}
+                panel-info
+            {% endif %}
+            ">
            <div class="panel-heading">Client Authorisation</div>
            <div class="panel-body">
                <dl class="dl-horizontal col-sm-6">
@@ -189,7 +198,7 @@
                    </dd>

                    <dt>Authorised at</dt>
-                    <dd>{{ object.authorisation.last_edited_at }}</dd>
+                    <dd>{{ object.authorisation.last_edited_at|date:"D d M Y H:i" }}</dd>

                    <dt>Authorised amount</dt>
                    <dd>
@@ -217,7 +226,7 @@
                <div class="panel-body">
                    <div class="well well-sm">
                        <h4>Notes</h4>
-                        {{ event.notes|markdown }}
+                        <div class="dont-break-out">{{ event.notes|markdown }}</div>
                    </div>
                    {% include 'RIGS/item_table.html' %}
                </div>
@@ -246,7 +255,7 @@
        <div class="row">
            <div class="col-sm-10 align-left">
                <a href="{% url 'event_history' object.pk %}" title="View Revision History">
-                    Last edited at {{ object.last_edited_at }} by {{ object.last_edited_by.name }}
+                    Last edited at {{ object.last_edited_at|default:'never' }} by {{ object.last_edited_by.name|default:'nobody' }}
                </a>
            </div>
            <div class="col-sm-2">
--- a/RIGS/templates/RIGS/event_form.html
+++ b/RIGS/templates/RIGS/event_form.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}
 {% load widget_tweaks %}
 {% load static %}
 {% load multiply from filters %}
--- a/RIGS/templates/RIGS/event_invoice.html
+++ b/RIGS/templates/RIGS/event_invoice.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}
 {% load paginator from filters %}
 {% load static %}

--- a/RIGS/templates/RIGS/eventauthorisation_client_success.html
+++ b/RIGS/templates/RIGS/eventauthorisation_client_success.html
@@ -6,7 +6,7 @@
    <p>
        Your event <b>N{{ object.event.pk|stringformat:"05d" }}</b> has been successfully authorised
        for <b>&pound;{{ object.amount }}</b>
-        by <b>{{ object.name }}</b> as of <b>{{ object.last_edited_at }}</b>.
+        by <b>{{ object.name }}</b> as of <b>{{ object.event.last_edited_at }}</b>.
    </p>

    <p>
--- a/RIGS/templates/RIGS/eventauthorisation_client_success.txt
+++ b/RIGS/templates/RIGS/eventauthorisation_client_success.txt
@@ -1,6 +1,6 @@
-Hi {{ to_name|default:"there" }},
+Hi {{ to_name|default_if_none:"there" }},

-Your event N{{object.event.pk|stringformat:"05d"}} has been successfully authorised for £{{object.amount}} by {{object.name}} as of {{object.last_edited_at}}.
+Your event N{{object.event.pk|stringformat:"05d"}} has been successfully authorised for £{{object.amount}} by {{object.name}} as of {{object.event.last_edited_at}}.

 {% if object.event.organisation and object.event.organisation.union_account %}{# internal #}
 Your event is now fully booked and payment will be processed by the finance department automatically.
--- a/RIGS/templates/RIGS/eventauthorisation_mic_success.txt
+++ b/RIGS/templates/RIGS/eventauthorisation_mic_success.txt
@@ -1,5 +1,5 @@
 Hi {{object.event.mic.get_full_name|default_if_none:"somebody"}},

-Just to let you know your event N{{object.event.pk|stringformat:"05d"}} has been successfully authorised for £{{object.amount}} by {{object.name}} as of {{object.last_edited_at}}.
+Just to let you know your event N{{object.event.pk|stringformat:"05d"}} has been successfully authorised for £{{object.amount}} by {{object.name}} as of {{object.event.last_edited_at}}.

 The TEC Rig Information Gathering System
--- a/RIGS/templates/RIGS/eventauthorisation_request.html
+++ b/RIGS/templates/RIGS/eventauthorisation_request.html
@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:'base_ajax.html,base.html' %}
+{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
 {% load widget_tweaks %}

 {% block title %}Request Authorisation{% endblock %}
--- a/RIGS/templates/RIGS/eventauthorisation_request_error.html
+++ b/RIGS/templates/RIGS/eventauthorisation_request_error.html
@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:'base_ajax.html,base.html' %}
+{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
 {% load widget_tweaks %}

 {% block title %}NottinghamTEC Email Address Required{% endblock %}
--- a/RIGS/templates/RIGS/index.html
+++ b/RIGS/templates/RIGS/index.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}
 {% block title %}RIGS{% endblock %}

 {% block content %}
@@ -20,6 +20,7 @@
                    <a class="list-group-item" href="{% url 'rigboard' %}"><span class="glyphicon glyphicon-list"></span> Rigboard</a>
                    <a class="list-group-item" href="{% url 'web_calendar' %}"><span class="glyphicon glyphicon-calendar"></span> Calendar</a>
                    {% if perms.RIGS.add_event %}<a class="list-group-item" href="{% url 'event_create' %}"><span class="glyphicon glyphicon-plus"></span> New Event</a>{% endif %}
+                    <a class="list-group-item" href="{% url 'asset_index' %}"><span class="glyphicon glyphicon-tag"></span> Asset Database </a>

                    <div class="list-group-item default"></div>

@@ -71,9 +72,8 @@
        </div>
    </div>
    {% if perms.RIGS.view_event %}
-    <div class="col-sm-6" >
+    <div class="col-sm-6">
        {% include 'RIGS/activity_feed.html' %}    
-        
    </div>
    {% endif %}
 </div>
--- a/RIGS/templates/RIGS/invoice_confirm_delete.html
+++ b/RIGS/templates/RIGS/invoice_confirm_delete.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}

 {% block title %}Delete payment on invoice {{ object.invoice.pk }}{% endblock %}

--- a/RIGS/templates/RIGS/invoice_detail.html
+++ b/RIGS/templates/RIGS/invoice_detail.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}

 {% block title %}Invoice {{ object.pk }}{% endblock %}

--- a/RIGS/templates/RIGS/invoice_list.html
+++ b/RIGS/templates/RIGS/invoice_list.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}
 {% load paginator from filters %}

 {% block title %}Invoices{% endblock %}
--- a/RIGS/templates/RIGS/organisation_detail.html
+++ b/RIGS/templates/RIGS/organisation_detail.html
@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
+ {% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
 {% load widget_tweaks %}
 {% load markdown_tags %}

--- a/RIGS/templates/RIGS/organisation_form.html
+++ b/RIGS/templates/RIGS/organisation_form.html
@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:'base_ajax.html,base.html' %}
+{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
 {% load widget_tweaks %}

 {% block title %}{% if object.pk %}Edit {{ object.name }}{% else %}Add Organisation{% endif %}{% endblock %}
--- a/RIGS/templates/RIGS/organisation_list.html
+++ b/RIGS/templates/RIGS/organisation_list.html
@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
 {% load widget_tweaks %}
 {% load paginator from filters %}
 {% load url_replace from filters %}
--- a/RIGS/templates/RIGS/password_reset_disable.html
+++ b/RIGS/templates/RIGS/password_reset_disable.html
@@ -0,0 +1,9 @@
+{% extends 'base_rigs.html' %}
+
+{% block title %}Password Reset Disabled{% endblock %}
+
+{% block content %}
+<h1>Password reset is disabled</h1>
+<p> We are very sorry for the inconvenience, but due to a security vulnerability, password reset is currently disabled until the vulnerability can be patched.</p>
+<p> If you are locked out of your account, please contact an administrator and we can manually perform a reset</p>
+{% endblock %}
--- a/RIGS/templates/RIGS/payment_confirm_delete.html
+++ b/RIGS/templates/RIGS/payment_confirm_delete.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}

 {% block title %}Delete payment on invoice {{ object.invoice.pk }}{% endblock %}

--- a/RIGS/templates/RIGS/person_detail.html
+++ b/RIGS/templates/RIGS/person_detail.html
@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
 {% load widget_tweaks %}
 {% load markdown_tags %}

--- a/RIGS/templates/RIGS/person_form.html
+++ b/RIGS/templates/RIGS/person_form.html
@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:'base_ajax.html,base.html' %}
+{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
 {% load widget_tweaks %}

 {% block title %}{% if object.pk %}Edit {{ object.name }}{% else %}Add Person{% endif %}{% endblock %}
--- a/RIGS/templates/RIGS/person_list.html
+++ b/RIGS/templates/RIGS/person_list.html
@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
 {% load widget_tweaks %}
 {% load paginator from filters %}
 {% load url_replace from filters %}
--- a/RIGS/templates/RIGS/profile_detail.html
+++ b/RIGS/templates/RIGS/profile_detail.html
@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}

 {% block title %}RIGS Profile {{object.pk}}{% endblock %}

--- a/RIGS/templates/RIGS/profile_form.html
+++ b/RIGS/templates/RIGS/profile_form.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}
 {% load widget_tweaks %}

 {% block title %}Update Profile {{object.name}}{% endblock %}
--- a/RIGS/templates/RIGS/rigboard.html
+++ b/RIGS/templates/RIGS/rigboard.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}

 {% block title %}Rigboard{% endblock %}

--- a/RIGS/templates/RIGS/venue_detail.html
+++ b/RIGS/templates/RIGS/venue_detail.html
@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
 {% load widget_tweaks %}
 {% load markdown_tags %}

--- a/RIGS/templates/RIGS/venue_form.html
+++ b/RIGS/templates/RIGS/venue_form.html
@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:'base_ajax.html,base.html' %}
+{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
 {% load widget_tweaks %}

 {% block title %}{{ object.pk|yesno:"Edit,Add" }} Venue{% endblock %}
--- a/RIGS/templates/RIGS/venue_list.html
+++ b/RIGS/templates/RIGS/venue_list.html
@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
 {% load widget_tweaks %}
 {% load paginator from filters %}
 {% load url_replace from filters %}
--- a/RIGS/templates/RIGS/version_changes.html
+++ b/RIGS/templates/RIGS/version_changes.html
@@ -14,7 +14,7 @@
            {% for change in itemChange.field_changes %}
                  <li class="list-group-item">
                    <h4 class="list-group-item-heading">{{ change.field.verbose_name }}</h4>
-                    {% include "RIGS/version_changes_change.html" %}
+                    <div class="dont-break-out">{% include "RIGS/version_changes_change.html" %}</div>
                  </li>
            {% endfor %}
            </ul>
@@ -23,4 +23,4 @@
    {% endfor %}
 {% else %}
    nothing useful
-{% endif %}
+{% endif %}
--- a/RIGS/templates/RIGS/version_changes_change.html
+++ b/RIGS/templates/RIGS/version_changes_change.html
@@ -2,11 +2,11 @@
 {% if change.linebreaks and change.new and change.old %}
    {% for diff in change.diff %}
        {% if diff.type == "insert" %}
-            <ins>{{ diff.text|linebreaksbr }}</ins>
+            <ins class="dont-break-out">{{ diff.text|linebreaksbr }}</ins>
        {% elif diff.type == "delete" %}
-            <del>{{diff.text|linebreaksbr}}</del>
+            <del class="dont-break-out">{{diff.text|linebreaksbr}}</del>
        {% else %}
-            <span>{{diff.text|linebreaksbr}}</span>
+            <span class="dont-break-out">{{diff.text|linebreaksbr}}</span>
        {% endif %}
    {% endfor %}
    {% else %}
--- a/RIGS/templates/RIGS/version_history.html
+++ b/RIGS/templates/RIGS/version_history.html
@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
 {% load to_class_name from filters %}
 {% load paginator from filters %}
 {% load static %}