--- a/src/pyams_scheduler/zmi/scheduler.py Sun Feb 18 15:30:56 2018 +0100
+++ b/src/pyams_scheduler/zmi/scheduler.py Mon Mar 05 12:30:32 2018 +0100
@@ -21,7 +21,7 @@
# import interfaces
from pyams_form.interfaces.form import IWidgetsSuffixViewletsManager
-from pyams_scheduler.interfaces import IScheduler, SCHEDULER_HANDLER_KEY
+from pyams_scheduler.interfaces import IScheduler
from pyams_scheduler.zmi.interfaces import ISchedulerMenu
from pyams_skin.interfaces import IInnerPage, IPageHeader
from pyams_skin.interfaces.container import ITableElementEditor
@@ -54,7 +54,6 @@
from pyams_zmi.control_panel import UtilitiesTable
from pyams_zmi.form import AdminDialogEditForm, AdminDialogDisplayForm, AdminDialogAddForm
from pyams_zmi.view import AdminView
-from pyams_zmq.socket import zmq_socket, zmq_response
from pyramid.url import resource_url
from pyramid.view import view_config
from z3c.form import field, button
@@ -377,16 +376,10 @@
@property
def values(self):
- handler = self.request.registry.settings.get(SCHEDULER_HANDLER_KEY, False)
- if handler:
- socket = zmq_socket(handler)
- socket.send_json(['get_jobs', {}])
- status, response = zmq_response(socket)
- if status == 200:
- return response
- else: # error
- return ()
- else:
+ status, response = self.context.get_jobs()
+ if status == 200:
+ return response
+ else: # error
return ()