diff --git a/apps/scheduler/__init__.py b/apps/scheduler/__init__.py index 80c406fd3b..84ee326f65 100644 --- a/apps/scheduler/__init__.py +++ b/apps/scheduler/__init__.py @@ -10,10 +10,12 @@ from django.dispatch import receiver from south.signals import pre_migrate from signaler.signals import pre_collectstatic +from project_tools.api import register_tool +from .links import job_list + logger = logging.getLogger(__name__) - @receiver(post_syncdb, dispatch_uid='scheduler_shutdown_post_syncdb') def scheduler_shutdown_post_syncdb(sender, **kwargs): logger.debug('Scheduler shut down on post syncdb signal') @@ -30,3 +32,6 @@ def sheduler_shutdown_pre_collectstatic(sender, **kwargs): def sheduler_shutdown_pre_migrate(sender, **kwargs): logger.debug('Scheduler shut down on pre_migrate signal') scheduler.shutdown() + + +register_tool(job_list) diff --git a/apps/scheduler/api.py b/apps/scheduler/api.py index 148320c3ab..83a3875eb2 100644 --- a/apps/scheduler/api.py +++ b/apps/scheduler/api.py @@ -25,3 +25,6 @@ def remove_job(name): scheduler.unschedule_job(registered_jobs[name]['job']) registered_jobs.pop(name) + +def get_job_list(): + return registered_jobs.values() diff --git a/apps/scheduler/links.py b/apps/scheduler/links.py new file mode 100644 index 0000000000..7190be22f9 --- /dev/null +++ b/apps/scheduler/links.py @@ -0,0 +1,7 @@ +from __future__ import absolute_import + +from django.utils.translation import ugettext_lazy as _ + +from .permissions import PERMISSION_VIEW_JOB_LIST + +job_list = {'text': _(u'interval job list'), 'view': 'job_list', 'icon': 'time.png', 'permissions': [PERMISSION_VIEW_JOB_LIST]} diff --git a/apps/scheduler/permissions.py b/apps/scheduler/permissions.py new file mode 100644 index 0000000000..203f675ff4 --- /dev/null +++ b/apps/scheduler/permissions.py @@ -0,0 +1,8 @@ +from __future__ import absolute_import + +from django.utils.translation import ugettext_lazy as _ + +from permissions.models import PermissionNamespace, Permission + +namespace = PermissionNamespace('scheduler', _(u'Scheduler')) +PERMISSION_VIEW_JOB_LIST = Permission.objects.register(namespace, 'jobs_list', _(u'View the interval job list')) diff --git a/apps/scheduler/static/images/icons/time.png b/apps/scheduler/static/images/icons/time.png new file mode 100644 index 0000000000..1caaec2102 Binary files /dev/null and b/apps/scheduler/static/images/icons/time.png differ diff --git a/apps/scheduler/urls.py b/apps/scheduler/urls.py new file mode 100644 index 0000000000..fde9602994 --- /dev/null +++ b/apps/scheduler/urls.py @@ -0,0 +1,5 @@ +from django.conf.urls.defaults import patterns, url + +urlpatterns = patterns('scheduler.views', + url(r'^list/$', 'job_list', (), 'job_list'), +) diff --git a/apps/scheduler/views.py b/apps/scheduler/views.py index 60f00ef0ef..3b4ef70a9a 100644 --- a/apps/scheduler/views.py +++ b/apps/scheduler/views.py @@ -1 +1,39 @@ -# Create your views here. +from __future__ import absolute_import + +from django.shortcuts import render_to_response +from django.template import RequestContext +from django.utils.translation import ugettext_lazy as _ +from django.core.exceptions import PermissionDenied + +from permissions.models import Permission +from common.utils import encapsulate + +from .permissions import PERMISSION_VIEW_JOB_LIST +from .api import get_job_list + + +def job_list(request): + Permission.objects.check_permissions(request.user, [PERMISSION_VIEW_JOB_LIST]) + + context = { + 'object_list': get_job_list(), + 'title': _(u'interval jobs'), + 'extra_columns': [ + { + 'name': _(u'label'), + 'attribute': encapsulate(lambda job: job['title']) + }, + { + 'name': _(u'start date time'), + 'attribute': encapsulate(lambda job: job['job'].trigger.start_date) + }, + { + 'name': _(u'interval'), + 'attribute': encapsulate(lambda job: job['job'].trigger.interval) + }, + ], + 'hide_object': True, + } + + return render_to_response('generic_list.html', context, + context_instance=RequestContext(request)) diff --git a/urls.py b/urls.py index 51ea2cd311..acb5126eda 100644 --- a/urls.py +++ b/urls.py @@ -34,6 +34,7 @@ urlpatterns = patterns('', (r'^feedback/', include('feedback.urls')), (r'^checkouts/', include('checkouts.urls')), (r'^installation/', include('installation.urls')), + (r'^scheduler/', include('scheduler.urls')), )