mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-02-28 09:08:24 +00:00
Compare commits
11 Commits
dependabot
...
63eb3bebef
| Author | SHA1 | Date | |
|---|---|---|---|
|
63eb3bebef
|
|||
|
f76222763d
|
|||
|
32c8573c71
|
|||
|
146dbb3be7
|
|||
|
c2cb73f73d
|
|||
|
e440ef88d4
|
|||
|
13fec124c6
|
|||
|
e842471b9e
|
|||
|
039f9f68d3
|
|||
| 2c808d0adf | |||
| 76cd5459fc |
18
RIGS/migrations/0050_event_forum_url.py
Normal file
18
RIGS/migrations/0050_event_forum_url.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 3.2.18 on 2023-06-26 17:46
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('RIGS', '0049_auto_20230529_1123'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='event',
|
||||||
|
name='forum_url',
|
||||||
|
field=models.URLField(blank=True, null=True),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -357,6 +357,8 @@ class Event(models.Model, RevisionMixin):
|
|||||||
auth_request_at = models.DateTimeField(null=True, blank=True)
|
auth_request_at = models.DateTimeField(null=True, blank=True)
|
||||||
auth_request_to = models.EmailField(blank=True, default='')
|
auth_request_to = models.EmailField(blank=True, default='')
|
||||||
|
|
||||||
|
forum_url = models.URLField(null=True, blank=True)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def display_id(self):
|
def display_id(self):
|
||||||
if self.pk:
|
if self.pk:
|
||||||
|
|||||||
@@ -77,6 +77,15 @@
|
|||||||
<dt class="col-sm-6">PO</dt>
|
<dt class="col-sm-6">PO</dt>
|
||||||
<dd class="col-sm-6">{{ object.purchase_order }}</dd>
|
<dd class="col-sm-6">{{ object.purchase_order }}</dd>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
<dt class="col-6">Forum Thread</dt>
|
||||||
|
{% if event.forum_thread %}
|
||||||
|
<dd class="col-6"><a href="{{event.forum_thread}}">{{event.forum_thread}}</a></dd>
|
||||||
|
{% else %}
|
||||||
|
<a href="{% url 'event_thread' event.pk %}" class="btn btn-primary" title="Create Forum Thread"><span
|
||||||
|
class="fas fa-plus"></span> <span
|
||||||
|
class="hidden-xs">Create Forum Thread</span></a>
|
||||||
|
{% endif %}
|
||||||
</dl>
|
</dl>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -110,6 +110,9 @@ urlpatterns = [
|
|||||||
path('event/<int:pk>/checkin/add/', login_required(views.EventCheckInOverride.as_view()),
|
path('event/<int:pk>/checkin/add/', login_required(views.EventCheckInOverride.as_view()),
|
||||||
name='event_checkin_override'),
|
name='event_checkin_override'),
|
||||||
|
|
||||||
|
path('event/<int:pk>/thread/', permission_required_with_403('RIGS.change_event')(views.CreateForumThread.as_view()), name='event_thread'),
|
||||||
|
path('event/webhook/', views.RecieveForumWebhook.as_view(), name='webhook_recieve'),
|
||||||
|
|
||||||
# Finance
|
# Finance
|
||||||
path('invoice/', permission_required_with_403('RIGS.view_invoice')(views.InvoiceIndex.as_view()),
|
path('invoice/', permission_required_with_403('RIGS.view_invoice')(views.InvoiceIndex.as_view()),
|
||||||
name='invoice_list'),
|
name='invoice_list'),
|
||||||
|
|||||||
@@ -3,6 +3,11 @@ import datetime
|
|||||||
import re
|
import re
|
||||||
import premailer
|
import premailer
|
||||||
import simplejson
|
import simplejson
|
||||||
|
import urllib
|
||||||
|
import hmac
|
||||||
|
|
||||||
|
from envparse import env
|
||||||
|
from bs4 import BeautifulSoup
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib import messages
|
from django.contrib import messages
|
||||||
@@ -19,6 +24,7 @@ from django.urls import reverse_lazy
|
|||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
from django.utils.decorators import method_decorator
|
from django.utils.decorators import method_decorator
|
||||||
from django.views import generic
|
from django.views import generic
|
||||||
|
from django.views.decorators.csrf import csrf_exempt
|
||||||
|
|
||||||
from PyRIGS import decorators
|
from PyRIGS import decorators
|
||||||
from PyRIGS.views import OEmbedView, is_ajax, ModalURLMixin, PrintView, get_related
|
from PyRIGS.views import OEmbedView, is_ajax, ModalURLMixin, PrintView, get_related
|
||||||
@@ -377,3 +383,38 @@ class EventAuthoriseRequestEmailPreview(generic.DetailView):
|
|||||||
context['to_name'] = self.request.GET.get('to_name', None)
|
context['to_name'] = self.request.GET.get('to_name', None)
|
||||||
context['target'] = 'event_authorise_form_preview'
|
context['target'] = 'event_authorise_form_preview'
|
||||||
return context
|
return context
|
||||||
|
|
||||||
|
|
||||||
|
class CreateForumThread(generic.base.RedirectView):
|
||||||
|
permanent = False
|
||||||
|
|
||||||
|
def get_redirect_url(self, *args, **kwargs):
|
||||||
|
event = get_object_or_404(models.Event, pk=kwargs['pk'])
|
||||||
|
|
||||||
|
if event.forum_url:
|
||||||
|
return event.forum_url
|
||||||
|
|
||||||
|
params = {
|
||||||
|
'title': str(event),
|
||||||
|
'body': f'https://rigs.nottinghamtec.co.uk/event/{event.pk}',
|
||||||
|
'category': 'rig-info'
|
||||||
|
}
|
||||||
|
return f'https://forum.nottinghamtec.co.uk/new-topic?{urllib.parse.urlencode(params)}'
|
||||||
|
|
||||||
|
|
||||||
|
class RecieveForumWebhook(generic.View):
|
||||||
|
@method_decorator(csrf_exempt)
|
||||||
|
def dispatch(self, request, *args, **kwargs):
|
||||||
|
return super().dispatch(request, *args, **kwargs)
|
||||||
|
|
||||||
|
def post(self, request, *args, **kwargs):
|
||||||
|
computed = f"sha256={hmac.new(env('FORUM_WEBHOOK_SECRET').encode(), request.body, digestmod='sha256').hexdigest()}"
|
||||||
|
if request.POST.get('X-Discourse-Event-Signature') == computed: # and request.POST.get('X-Discourse-Event') == "topic_created":
|
||||||
|
body = json.loads(request.body.decode('utf-8'))
|
||||||
|
event_id = int(body['title'][1:5]) # find the ID, force convert it to an int to eliminate leading zeros
|
||||||
|
event = models.Event.objects.filter(pk=event_id).first()
|
||||||
|
if event:
|
||||||
|
event.forum_url = "https://forum.nottinghamtec.co.uk/t/{}"
|
||||||
|
event.save()
|
||||||
|
return HttpResponse(status=200)
|
||||||
|
return HttpResponse(status=204)
|
||||||
|
|||||||
Reference in New Issue
Block a user