mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-19 14:32:16 +00:00
Arona Jones
4a4d4a5cf3
* CHANGE: First pass at opening up RIGS #233 Whilst it makes it something of a misnomer, the intent is to make the 'view_event' perm a permission to view event details like client/price. I don't see the point in giving everyone 'view_event' and adding a new 'view_event_detail'...Open to arguments the other way. * CHANGE: New user signups now require admin approval Given that I intend to reveal much more data to new users this seems necessary... * CHORE: Fix CI * FIX: Legacy Profiles are now auto-approved correctly * Add testing of approval mechanism This fixes the other functional tests failing because the user cannot login without being approved. * Superusers bypass approval check This should fix the remainder of the tests * Prevent unapproved users logging in through embeds Test suite doing its job...! * FIX: Require login on events and event embeds again Little too far to the open side there Arona... Whooooooops! * FIX: Use has_oembed decorator for events * FIX: Re-prevent basic seeing reversion This is to prevent financials/client data leaking when changed. Hopefully can show them a filtered version in future. * FIX: Remove mitigation for #264 Someone quietly fixed it, it appears * FEAT: Add admin email notif when an account is activated and awaiting approval No async or time-since shenanigans yet! * FIX: Whoops, undo accidental whitespace change * FEAT: Add a fifteen min cooldown between emails to admins Probably not the right way to go about it...but it does work! TODO: How to handle cooldown-emailing shared mailbox addresses? * FIX: Remove event modal history deadlink for basic users Also removes some links on the RIGS homepage that will deadlink for them * FIX: Wrong perms syntax for history pages * CHORE: Squash migrations * FIX: Use a setting for cooldown * FIX: Minor code improvements
107 lines
3.6 KiB
HTML
107 lines
3.6 KiB
HTML
{% extends 'base_embed.html' %}
|
|
{% load static from staticfiles %}
|
|
|
|
{% block content %}
|
|
|
|
<div class="row">
|
|
<div class="col-sm-12">
|
|
<a href="/">
|
|
<span class="source"> R<small>ig</small> I<small>nformation</small> G<small>athering</small> S<small>ystem</small></span>
|
|
</a>
|
|
</div>
|
|
|
|
<div class="col-sm-12">
|
|
<span class="pull-right">
|
|
{% if object.mic %}
|
|
<div class="text-center">
|
|
<img src="{{ object.mic.profile_picture }}" class="event-mic-photo img-rounded"/>
|
|
</div>
|
|
{% elif object.is_rig %}
|
|
<span class="glyphicon glyphicon-exclamation-sign"></span>
|
|
{% endif %}
|
|
</span>
|
|
|
|
<h3>
|
|
<a href="{% url 'event_detail' object.pk %}">
|
|
{% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}
|
|
| {{ object.name }} </a>
|
|
{% if object.venue %}
|
|
<small>at {{ object.venue }}</small>
|
|
{% endif %}
|
|
<br/><small>
|
|
{{ object.start_date|date:"D d/m/Y" }}
|
|
{% if object.has_start_time %}
|
|
{{ object.start_time|date:"H:i" }}
|
|
{% endif %}
|
|
{% if object.end_date or object.has_end_time %}
|
|
–
|
|
{% endif %}
|
|
{% if object.end_date and object.end_date != object.start_date %}
|
|
{{ object.end_date|date:"D d/m/Y" }}
|
|
{% endif %}
|
|
{% if object.has_end_time %}
|
|
{{ object.end_time|date:"H:i" }}
|
|
{% endif %}
|
|
</small>
|
|
</h3>
|
|
|
|
<div class="row">
|
|
<div class="col-xs-6">
|
|
<p>
|
|
<strong>Status:</strong>
|
|
{{ object.get_status_display }}
|
|
</p>
|
|
<p>
|
|
{% if object.is_rig %}
|
|
<strong>Client:</strong> {{ object.person.name }}
|
|
{% if object.organisation %}
|
|
for {{ object.organisation.name }}
|
|
{% endif %}
|
|
{% if object.dry_hire %}(Dry Hire){% endif %}
|
|
{% else %}
|
|
<strong>Non-Rig</strong>
|
|
{% endif %}
|
|
</p>
|
|
<p>
|
|
<strong>MIC:</strong>
|
|
{% if object.mic %}
|
|
{{object.mic.name}}
|
|
{% else %}
|
|
None
|
|
{% endif %}
|
|
</p>
|
|
</div>
|
|
<div class="col-xs-6">
|
|
|
|
{% if object.meet_at %}
|
|
<p>
|
|
<strong>Crew meet:</strong>
|
|
{{ object.meet_at|date:"H:i" }} {{ object.meet_at|date:"(Y-m-d)" }}
|
|
</p>
|
|
{% endif %}
|
|
{% if object.access_at %}
|
|
<p>
|
|
<strong>Access at:</strong>
|
|
{{ object.access_at|date:"H:i" }} {{ object.access_at|date:"(Y-m-d)" }}
|
|
</p>
|
|
{% endif %}
|
|
<p>
|
|
<strong>Last updated:</strong>
|
|
{{ object.last_edited_at }} by "{{ object.last_edited_by.initials }}"
|
|
</p>
|
|
</div>
|
|
</div>
|
|
{% if object.description %}
|
|
<p>
|
|
<strong>Description: </strong>
|
|
{{ object.description|linebreaksbr }}
|
|
</p>
|
|
{% endif %}
|
|
|
|
</table>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
{% endblock %}
|