From 08fac9fd9de6ba1ea2b8de4d3d0319cd57412ac9 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 30 Jan 2019 03:11:07 -0400 Subject: [PATCH] Events: Update generic view interface Signed-off-by: Roberto Rosario --- mayan/apps/events/apps.py | 1 + mayan/apps/events/views.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mayan/apps/events/apps.py b/mayan/apps/events/apps.py index a320a2b454..60c1f562b7 100644 --- a/mayan/apps/events/apps.py +++ b/mayan/apps/events/apps.py @@ -29,6 +29,7 @@ class EventsApp(MayanAppConfig): def ready(self): super(EventsApp, self).ready() + Action = apps.get_model(app_label='actstream', model_name='Action') Notification = self.get_model(model_name='Notification') StoredEventType = self.get_model(model_name='StoredEventType') diff --git a/mayan/apps/events/views.py b/mayan/apps/events/views.py index 49603b33bb..a206c8975c 100644 --- a/mayan/apps/events/views.py +++ b/mayan/apps/events/views.py @@ -33,7 +33,7 @@ class EventListView(SingleObjectListView): 'title': _('Events'), } - def get_object_list(self): + def get_source_queryset(self): return Action.objects.all() @@ -121,7 +121,7 @@ class NotificationListView(SingleObjectListView): 'title': _('Notifications'), } - def get_object_list(self): + def get_source_queryset(self): return self.request.user.notifications.all() @@ -184,7 +184,7 @@ class ObjectEventListView(EventListView): klass=queryset, pk=self.kwargs['object_id'] ) - def get_object_list(self): + def get_source_queryset(self): return any_stream(self.get_object()) @@ -274,5 +274,5 @@ class VerbEventListView(SingleObjectListView): ) % EventType.get(name=self.kwargs['verb']), } - def get_object_list(self): + def get_source_queryset(self): return Action.objects.filter(verb=self.kwargs['verb'])