merge commit

aleksis/apps/ticdesk/templates/ticdesk/teckids_event/manage.html

@@ -10,6 +10,6 @@
   {% blocktrans %}Upcoming events{% endblocktrans %}
  </h5>
 
- {% render_table manage_events_table %}
+ {% render_table object_list %}
 
 {% endblock %}

aleksis/apps/ticdesk/urls.py

@@ -7,7 +7,7 @@ urlpatterns = [
     path("event/<int:id_>/feedback", views.feedback_event, name="feedback_event_by_id"),
     path("event/<int:id_>/register", views.register_event, name="register_event_by_id"),
     path("events/create", views.edit_event, name="create_event"),
-    path("events/manage", views.manage_events, name="manage_events"),
+    path("events/manage", views.ManageEvents.as_view(), name="manage_events"),
     path("events/", views.events, name="events"),
     path("vouchers/create", views.edit_voucher, name="create_vouchers"),
     path(

aleksis/apps/ticdesk/views.py

@@ -8,12 +8,13 @@ from django.utils import timezone
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import redirect, render
 from django.utils.translation import ugettext as _
+from django.views.generic.list import ListView
 
 import pytz
 import reversion
 from reversion.views import create_revision
 from django_tables2 import RequestConfig
-from rules.contrib.views import permission_required
+from rules.contrib.views import permission_required, PermissionRequiredMixin
 from templated_email import send_templated_mail
 
 from aleksis.core.models import Activity, Person
@@ -352,20 +353,16 @@ def edit_event(request: HttpRequest, id_: Optional[int] = None) -> HttpResponse:
     return render(request, "ticdesk/teckids_event/edit.html", context)
 
 
-@permission_required("ticdesk.edit_events")
-def manage_events(request):
-    context = {}
-
-    # Get all upcoming events
-    now = timezone.datetime.today()
-    events = TeckidsEvent.objects.filter(date_event__gte=now)
+class ManageEvents(ListView, PermissionRequiredMixin):
+    """View listing upcoming events."""
 
-    # Build table
-    manage_events_table = ManageEventsTable(events)
-    RequestConfig(request).configure(manage_events_table)
-    context["manage_events_table"] = manage_events_table
+    template_name = "ticdesk/teckids_event/manage.html"
+    permission_required = "ticdesk.edit_events"
+    context = {}
 
-    return render(request, "ticdesk/teckids_event/manage.html", context)
+    def get_queryset(self):
+        now = timezone.datetime.today()
+        return TeckidsEvent.objects.filter(date_event__gte=now)
 
 
 @permission_required("ticdesk.view_vouchers")