diff --git a/website/events/admin.py b/website/events/admin.py index 1c97c6669bf80cc36f87b4271111044799a1f761..bfdab30ee98e1ac699e3c332c3bd3126c1011de0 100644 --- a/website/events/admin.py +++ b/website/events/admin.py @@ -226,10 +226,6 @@ class EventAdmin(DoNextTranslatedModelAdmin): self.admin_site.admin_view( admin_views.EventRegistrationEmailsExport.as_view()), name='events_event_export_email'), - path('/all-present/', - self.admin_site.admin_view( - admin_views.EventRegistrationsMarkPresent.as_view()), - name='events_event_all_present'), path('/message/', self.admin_site.admin_view( admin_views.EventMessage.as_view(admin=self)), diff --git a/website/events/admin_views.py b/website/events/admin_views.py index 4e93311731c7340286891458aee25870b6455103..254d49a726c369fc52141a513a5ff6e7ccf5539e 100644 --- a/website/events/admin_views.py +++ b/website/events/admin_views.py @@ -293,37 +293,3 @@ class EventRegistrationEmailsExport(TemplateView, PermissionRequiredMixin): context['addresses'] = addresses context['no_addresses'] = no_addresses return context - - -@method_decorator(staff_member_required, name='dispatch') -@method_decorator(organiser_only, name='dispatch') -class EventRegistrationsMarkPresent(View, PermissionRequiredMixin): - """ - Renders a page that outputs all email addresses of registered members - for an event - """ - template_name = 'events/admin/email_export.html' - permission_required = 'events.change_registration' - - def get(self, request, pk): - """ - Mark all registrations of an event as present - - :param request: the request object - :param pk: the primary key of the event - :return: HttpResponse 302 to the event admin page - """ - event = get_object_or_404(Event, pk=pk) - - if event.max_participants is None: - registrations_query = event.registration_set.filter( - date_cancelled=None) - else: - registrations_query = (event.registration_set - .filter(date_cancelled=None) - .order_by('date')[:event.max_participants]) - - event.registration_set.filter(pk__in=registrations_query).update( - present=True, payment=Registration.PAYMENT_CASH) - - return redirect('admin:events_event_details', event.pk) diff --git a/website/events/locale/nl/LC_MESSAGES/django.mo b/website/events/locale/nl/LC_MESSAGES/django.mo index 8f4eee25d899efd8549e1f4ac3d0885c3e5e82a4..a385a909caaa5c0efc87a478525f9be9ee8f3ff2 100644 Binary files a/website/events/locale/nl/LC_MESSAGES/django.mo and b/website/events/locale/nl/LC_MESSAGES/django.mo differ diff --git a/website/events/locale/nl/LC_MESSAGES/django.po b/website/events/locale/nl/LC_MESSAGES/django.po index 896877293f342ed1eb834275e6df5c0163e441e7..406cd98eba1c145a6e98d18c5adf1e10ffc78c7d 100644 --- a/website/events/locale/nl/LC_MESSAGES/django.po +++ b/website/events/locale/nl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-07 19:56+0200\n" +"POT-Creation-Date: 2019-08-14 08:06+0200\n" "PO-Revision-Date: 2019-08-07 19:57+0200\n" "Last-Translator: Thom Wiggers \n" "Language-Team: \n" @@ -487,10 +487,6 @@ msgstr "Exporteer aanmeldingen" msgid "Export email addresses of attendees" msgstr "Exporteer e-mailadressen van aanwezigen" -#: templates/events/admin/details.html -msgid "Set all registered to paid and present" -msgstr "Zet iedereen op betaald en present" - #: templates/events/admin/details.html msgid "Send pushnotification to registered users" msgstr "Stuur pushnotificatie naar participerende gebruikers" diff --git a/website/events/locale/nl/LC_MESSAGES/djangojs.mo b/website/events/locale/nl/LC_MESSAGES/djangojs.mo index 28005efcb4f257a11277265f1235afd7574ac523..45b4277b004919c924e03b8b40bcd0697d490de4 100644 Binary files a/website/events/locale/nl/LC_MESSAGES/djangojs.mo and b/website/events/locale/nl/LC_MESSAGES/djangojs.mo differ diff --git a/website/events/templates/events/admin/details.html b/website/events/templates/events/admin/details.html index 33d8ed06d0259dd70cf522b33f6115ffe691fb8e..fb68d9a5fcb7540bccfa7b18dbd4658b48ad4e14 100644 --- a/website/events/templates/events/admin/details.html +++ b/website/events/templates/events/admin/details.html @@ -54,7 +54,6 @@
{% trans "Export registrations" %} {% trans "Export email addresses of attendees" %} - {% trans "Set all registered to paid and present" %} {% trans "Send pushnotification to registered users" %}