arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-02-05 14:48:22 +00:00
Code Issues Projects Releases Wiki Activity

Rework of subhire list

Browse Source
This commit is contained in:
FreneticScribbler
2022-12-19 17:33:01 +00:00
parent 773f55ac84
commit 1615e27767
10 changed files with 182 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
RIGS/views/rigboard.py
View File

@@ -204,27 +204,7 @@ class EventArchive(generic.ListView):
"Muppet! Check the dates, it has been fixed for you.")
start, end = end, start # Stop the impending fail
filter = Q()
if end != "":
filter &= Q(start_date__lte=end)
if start:
filter &= Q(start_date__gte=start)
q = self.request.GET.get('q', "")
objects = self.model.objects.all()
if q:
objects = self.model.objects.search(q)
status = self.request.GET.getlist('status', "")
if len(status) > 0:
filter &= Q(status__in=status)
qs = objects.filter(filter).order_by('-start_date')
# Preselect related for efficiency
qs.select_related('person', 'organisation', 'venue', 'mic')
qs = self.model.objects.event_search(self.request.GET.get('q', None), start, end, self.request.GET.get('status', ""))
if not qs.exists():
messages.add_message(self.request, messages.WARNING, "No events have been found matching those criteria.")