DAV-KA/django-dav-events
1
0
Fork 0
Code Issues 24 Pull Requests Actions Releases Wiki Activity

master #81

Merged
heinzel merged 3 commits from master into stage 2024-09-12 15:29:20 +02:00
Conversation 0 Commits 3 Files Changed 3 +6 -2
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit af3afc9f9a - Show all commits

6
dav_events/models/event.py
View File

@@ -528,8 +528,9 @@ class Event(models.Model):
template = get_template(template_name) template = get_template(template_name)
return template.render(self.get_template_context()) return template.render(self.get_template_context())
def as_dict(self, json=True): def as_dict(self, json=True, add_registration_url=False):
d = { d = {
'id': self.id,
'number': self.get_number(), 'number': self.get_number(),
'title': self.title, 'title': self.title,
'description': self.description, 'description': self.description,
@@ -617,4 +618,7 @@ class Event(models.Model):
value = getattr(self, field) value = getattr(self, field)
d[field] = value d[field] = value
if add_registration_url:
d['registration_url'] = reverse('dav_registration:event', kwargs={'pk': self.pk})
return d return d

2
dav_registration/views.py
View File

@@ -84,7 +84,7 @@ def EventListAsJSONView(request):
filter_exp &= Q(sport__in=filter_cleaned) | Q(level__in=filter_cleaned) filter_exp &= Q(sport__in=filter_cleaned) | Q(level__in=filter_cleaned)
qs = Event.objects.filter(filter_exp).order_by('first_day', 'number').distinct() qs = Event.objects.filter(filter_exp).order_by('first_day', 'number').distinct()
data = [event.as_dict(json=True) for event in qs] data = [event.as_dict(json=True, add_registration_url=True) for event in qs]
response = JsonResponse(data, safe=False) response = JsonResponse(data, safe=False)
return response return response