From f39fde8b4b5129caacef17f4221f5642d006eb79 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 23 Jun 2017 14:31:45 -0400 Subject: [PATCH] Display error when not able to retrieve tasks. Signed-off-by: Roberto Rosario --- mayan/apps/mayan_task_manager/views.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/mayan/apps/mayan_task_manager/views.py b/mayan/apps/mayan_task_manager/views.py index 060c7b1dc2..5c348ac593 100644 --- a/mayan/apps/mayan_task_manager/views.py +++ b/mayan/apps/mayan_task_manager/views.py @@ -1,5 +1,6 @@ from __future__ import absolute_import, unicode_literals +from django.contrib import messages from django.utils.translation import ugettext_lazy as _ from common.generics import SingleObjectListView @@ -32,9 +33,19 @@ class QueueActiveTaskListView(SingleObjectListView): def get_object(self): return CeleryQueue.get(queue_name=self.kwargs['queue_name']) - def get_queryset(self): + def get_task_list(self): return self.get_object().get_active_tasks() + def get_queryset(self): + try: + return self.get_task_list() + except Exception as exception: + messages.error( + self.request, + _('Unable to retrieve task list; %s') % exception + ) + return () + class QueueScheduledTaskListView(QueueActiveTaskListView): def get_extra_context(self): @@ -44,7 +55,7 @@ class QueueScheduledTaskListView(QueueActiveTaskListView): 'title': _('Scheduled tasks in queue: %s') % self.get_object() } - def get_queryset(self): + def get_task_list(self): return self.get_object().get_scheduled_tasks() @@ -56,5 +67,5 @@ class QueueReservedTaskListView(QueueActiveTaskListView): 'title': _('Reserved tasks in queue: %s') % self.get_object() } - def get_queryset(self): + def get_task_list(self): return self.get_object().get_reserved_tasks()