From 66f451b23faa3a048b9dc448de9bf546c2f7c12e Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 11 Sep 2012 12:58:09 -0400 Subject: [PATCH] Update and enable the scheduler app --- apps/scheduler/__init__.py | 2 -- apps/scheduler/icons.py | 8 ++++++++ apps/scheduler/links.py | 7 ++++--- apps/scheduler/registry.py | 12 ++++++++++++ 4 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 apps/scheduler/icons.py create mode 100644 apps/scheduler/registry.py diff --git a/apps/scheduler/__init__.py b/apps/scheduler/__init__.py index a41ed11a91..da3934a3e5 100644 --- a/apps/scheduler/__init__.py +++ b/apps/scheduler/__init__.py @@ -4,7 +4,6 @@ import logging import atexit import sys -from project_tools.api import register_tool from navigation.api import bind_links from .links import scheduler_tool_link, scheduler_list, job_list @@ -28,7 +27,6 @@ if any([command in sys.argv for command in SHUTDOWN_COMMANDS]): # Prevent any new scheduler afterwards to start LocalScheduler.lockdown() -register_tool(scheduler_tool_link) atexit.register(schedule_shutdown_on_exit) bind_links([LocalScheduler, 'scheduler_list', 'job_list'], scheduler_list, menu_name='secondary_menu') bind_links([LocalScheduler], job_list) diff --git a/apps/scheduler/icons.py b/apps/scheduler/icons.py new file mode 100644 index 0000000000..b21aa705ac --- /dev/null +++ b/apps/scheduler/icons.py @@ -0,0 +1,8 @@ +from __future__ import absolute_import + +from icons.literals import TIME, TIMELINE_MARKER +from icons import Icon + +icon_scheduler_tool_link = Icon(TIME) +icon_scheduler_list = Icon(TIME) +icon_job_list = Icon(TIMELINE_MARKER) diff --git a/apps/scheduler/links.py b/apps/scheduler/links.py index 9ad1a1ff10..8ab7e44ea2 100644 --- a/apps/scheduler/links.py +++ b/apps/scheduler/links.py @@ -5,7 +5,8 @@ from django.utils.translation import ugettext_lazy as _ from navigation.api import Link from .permissions import PERMISSION_VIEW_JOB_LIST, PERMISSION_VIEW_SCHEDULER_LIST +from .icons import icon_scheduler_tool_link, icon_scheduler_list, icon_job_list -scheduler_tool_link = Link(text=_(u'local schedulers'), view='scheduler_list', icon='time.png', permissions=[PERMISSION_VIEW_SCHEDULER_LIST]) -scheduler_list = Link(text=_(u'scheduler list'), view='scheduler_list', sprite='time', permissions=[PERMISSION_VIEW_SCHEDULER_LIST]) -job_list = Link(text=_(u'interval job list'), view='job_list', args='object.name', sprite='timeline_marker', permissions=[PERMISSION_VIEW_JOB_LIST]) +scheduler_tool_link = Link(text=_(u'local schedulers'), view='scheduler_list', icon=icon_scheduler_tool_link, permissions=[PERMISSION_VIEW_SCHEDULER_LIST]) +scheduler_list = Link(text=_(u'scheduler list'), view='scheduler_list', icon=icon_scheduler_list, permissions=[PERMISSION_VIEW_SCHEDULER_LIST]) +job_list = Link(text=_(u'interval job list'), view='job_list', args='object.name', icon=icon_job_list, permissions=[PERMISSION_VIEW_JOB_LIST]) diff --git a/apps/scheduler/registry.py b/apps/scheduler/registry.py new file mode 100644 index 0000000000..c1535f5fc2 --- /dev/null +++ b/apps/scheduler/registry.py @@ -0,0 +1,12 @@ +from __future__ import absolute_import + +from django.utils.translation import ugettext_lazy as _ + +from .icons import icon_scheduler_tool_link +from .links import scheduler_tool_link + +label = _(u'Scheduler') +description = _(u'Executes timed tasks.') +dependencies = ['app_registry', 'icons', 'navigation'] +icon = icon_scheduler_tool_link +tool_links = [scheduler_tool_link]