diff -r a72adec69419 -r e9e71b24f431 src/pyams_scheduler/zmi/task.py --- a/src/pyams_scheduler/zmi/task.py Wed Mar 28 16:02:34 2018 +0200 +++ b/src/pyams_scheduler/zmi/task.py Wed Apr 11 11:37:21 2018 +0200 @@ -98,6 +98,8 @@ class TaskPropertiesEditForm(AdminDialogEditForm): """Scheduler task properties edit form""" + prefix = 'task_properties.' + @property def title(self): translate = self.request.localizer.translate @@ -126,6 +128,8 @@ class TaskScheduleEditForm(AdminDialogEditForm): """Scheduler task base schedule edit form""" + prefix = 'task_schedule.' + @property def title(self): translate = self.request.localizer.translate @@ -207,6 +211,8 @@ class TaskRunForm(AdminDialogEditForm): """Task runner form""" + prefix = 'task_run.' + @property def title(self): translate = self.request.localizer.translate @@ -244,15 +250,21 @@ def get_ajax_output(self, changes): translate = self.request.localizer.translate if self.actions['execute'].name in self.request.params: - return {'status': 'success', - 'message': translate(_('Task scheduled in normal mode will start in 5 seconds...'))} + return { + 'status': 'success', + 'message': translate(_('Task scheduled in normal mode will start in 5 seconds...')) + } else: - return {'status': 'message', - 'content': {'raw': True, - 'text': changes, - 'target': '#task-debug-report'}, - 'message': translate(_('Task run in debug mode. Please check your console...')), - 'close_form': False} + return { + 'status': 'message', + 'content': { + 'raw': True, + 'text': changes, + 'target': '#task-debug-report' + }, + 'message': translate(_('Task run in debug mode. Please check your console...')), + 'close_form': False + } @adapter_config(context=(ITask, IAdminLayer, TaskRunForm), provides=IFormHelp) @@ -310,14 +322,19 @@ @property def data_attributes(self): - return {'table': {'data-ams-datatable-global-filter': 'false', - 'data-ams-datatable-info': 'false', - 'data-ams-datatable-sort': 'false', - 'data-ams-datatable-sdom': "t<'dt-row dt-bottom-row'<'text-right'p>>", - 'data-ams-datatable-display-length': '20', - 'data-ams-datatable-pagination-type': 'bootstrap_prevnext'}, - 'tr': {'data-ams-url': lambda x, col: absolute_url(x, self.request, 'info.json'), - 'data-ams-target': '#task-history-report'}} + return { + 'table': { + 'data-ams-datatable-global-filter': 'false', + 'data-ams-datatable-info': 'false', + 'data-ams-datatable-sort': 'false', + 'data-ams-datatable-sdom': "t<'dt-row dt-bottom-row'<'text-right'p>>", + 'data-ams-datatable-display-length': '20', + 'data-ams-datatable-pagination-type': 'bootstrap_prevnext'}, + 'tr': { + 'data-ams-url': lambda x, col: absolute_url(x, self.request, 'info.json'), + 'data-ams-target': '#task-history-report' + } + } def getCSSHighlightClass(self, column, item, cssClass): return STATUS_CLASS[item.status] @@ -365,8 +382,12 @@ @view_config(name='info.json', context=ITaskHistory, request_type=IPyAMSLayer, permission=MANAGE_SYSTEM_PERMISSION, renderer='json', xhr=True) def TaskHistoryInfoView(request): - return {'status': 'success', - 'close_form': False, - 'content': {'raw': True, - 'text': request.context.report, - 'target': '#task-history-report'}} + return { + 'status': 'success', + 'close_form': False, + 'content': { + 'raw': True, + 'text': request.context.report, + 'target': '#task-history-report' + } + }