From 89af7e9f123ccb99ada4ba7dcc6dbceefbe3881f Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 21 Oct 2016 03:59:36 -0400 Subject: [PATCH] Add tests for the events_for_object view and fix the content type of the same view response. Fixes GitLab issue #311 for the events link. --- mayan/apps/events/apps.py | 1 + mayan/apps/events/views.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mayan/apps/events/apps.py b/mayan/apps/events/apps.py index b00954e817..74a6ddc661 100644 --- a/mayan/apps/events/apps.py +++ b/mayan/apps/events/apps.py @@ -15,6 +15,7 @@ from .widgets import event_type_link class EventsApp(MayanAppConfig): name = 'events' + test = True verbose_name = _('Events') def ready(self): diff --git a/mayan/apps/events/views.py b/mayan/apps/events/views.py index 3e49200a3d..779bfbc005 100644 --- a/mayan/apps/events/views.py +++ b/mayan/apps/events/views.py @@ -43,16 +43,16 @@ class ObjectEventListView(EventListView): view_permissions = None def dispatch(self, request, *args, **kwargs): - self.content_type = get_object_or_404( + self.object_content_type = get_object_or_404( ContentType, app_label=self.kwargs['app_label'], model=self.kwargs['model'] ) try: - self.content_object = self.content_type.get_object_for_this_type( + self.content_object = self.object_content_type.get_object_for_this_type( pk=self.kwargs['object_id'] ) - except self.content_type.model_class().DoesNotExist: + except self.object_content_type.model_class().DoesNotExist: raise Http404 try: