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

Disable auth request button for authorised events

Browse Source 
Overrides and closes #377
This commit is contained in:
FreneticScribbler
2022-02-15 00:29:29 +00:00
parent 5215af349a
commit 6c14b30c13
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RIGS/templates/partials/event_detail_buttons.html
View File

@@ -9,7 +9,7 @@
{% if event.internal %} {% if event.internal %}
<a class="btn item-add modal-href event-authorise-request <a class="btn item-add modal-href event-authorise-request
{% if event.authorised %} {% if event.authorised %}
btn-success active btn-success active disabled
{% elif event.authorisation and event.authorisation.amount != event.total and event.authorisation.last_edited_at > event.auth_request_at %} {% elif event.authorisation and event.authorisation.amount != event.total and event.authorisation.last_edited_at > event.auth_request_at %}
btn-warning btn-warning
{% elif event.auth_request_to %} {% elif event.auth_request_to %}
@@ -18,7 +18,7 @@
btn-secondary btn-secondary
{% endif %} {% endif %}
" "
href="{% url 'event_authorise_request' object.pk %}"> {% if event.authorised %}aria-disabled="true"{% else %}href="{% url 'event_authorise_request' object.pk %}"{% endif %}>
<span class="fas fa-paper-plane"></span> <span class="fas fa-paper-plane"></span>
<span class="d-none d-sm-inline"> <span class="d-none d-sm-inline">
{% if event.authorised %} {% if event.authorised %}

22
RIGS/views/rigboard.py
View File

@@ -83,6 +83,13 @@ class EventOEmbed(OEmbedView):
url_name = 'event_embed' url_name = 'event_embed'
def get_related(form, context): # Get some other objects to include in the form. Used when there are errors but also nice and quick.
for field, model in form.related_models.items():
value = form[field].value()
if value is not None and value != '':
context[field] = model.objects.get(pk=value)
class EventCreate(generic.CreateView): class EventCreate(generic.CreateView):
model = models.Event model = models.Event
form_class = forms.EventForm form_class = forms.EventForm
@@ -98,11 +105,8 @@ class EventCreate(generic.CreateView):
if hasattr(form, 'items_json') and re.search(r'"-\d+"', form['items_json'].value()): if hasattr(form, 'items_json') and re.search(r'"-\d+"', form['items_json'].value()):
messages.info(self.request, "Your item changes have been saved. Please fix the errors and save the event.") messages.info(self.request, "Your item changes have been saved. Please fix the errors and save the event.")
# Get some other objects to include in the form. Used when there are errors but also nice and quick. get_related(form, context)
for field, model in form.related_models.items():
value = form[field].value()
if value is not None and value != '':
context[field] = model.objects.get(pk=value)
return context return context
def get_success_url(self): def get_success_url(self):
@@ -121,11 +125,7 @@ class EventUpdate(generic.UpdateView):
form = context['form'] form = context['form']
# Get some other objects to include in the form. Used when there are errors but also nice and quick. get_related(form, context)
for field, model in form.related_models.items():
value = form[field].value()
if value is not None and value != '':
context[field] = model.objects.get(pk=value)
return context return context
@@ -312,7 +312,7 @@ class EventAuthorise(generic.UpdateView):
messages.add_message(self.request, messages.WARNING, messages.add_message(self.request, messages.WARNING,
"This event has already been authorised, but the amount has changed. " + "This event has already been authorised, but the amount has changed. " +
"Please check the amount and reauthorise.") "Please check the amount and reauthorise.")
return super(EventAuthorise, self).get(request, *args, **kwargs) return super().get(request, *args, **kwargs)
def get_form(self, **kwargs): def get_form(self, **kwargs):
form = super().get_form(**kwargs) form = super().get_form(**kwargs)