From f9866e846a3a2207141a3898d70d561cb03d2f7c Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 27 Apr 2019 01:37:14 -0400 Subject: [PATCH] Use the 'handler' prefix Signed-off-by: Roberto Rosario --- HISTORY.rst | 1 + docs/releases/3.2.rst | 1 + mayan/apps/document_states/apps.py | 14 ++++++++------ mayan/apps/document_states/handlers.py | 18 +++++++++--------- mayan/apps/permissions/apps.py | 5 +++-- mayan/apps/permissions/handlers.py | 4 ++-- 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index f9e4eab63a..534d211af8 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -161,6 +161,7 @@ * Backport search improvements. * Remove search elapsed time calculation. * Remove SEARCH_LIMIT setting. +* Use the 'handler' prefix for all the signal handler functions. 3.1.11 (2019-04-XX) =================== diff --git a/docs/releases/3.2.rst b/docs/releases/3.2.rst index 9183739253..a456a038f5 100644 --- a/docs/releases/3.2.rst +++ b/docs/releases/3.2.rst @@ -193,6 +193,7 @@ Other changes * Backport search improvements. * Remove search elapsed time calculation. * Remove SEARCH_LIMIT setting. +* Use the 'handler' prefix for all the signal handler functions. Removals -------- diff --git a/mayan/apps/document_states/apps.py b/mayan/apps/document_states/apps.py index bcb1fb03cd..86cdfe3faf 100644 --- a/mayan/apps/document_states/apps.py +++ b/mayan/apps/document_states/apps.py @@ -22,7 +22,7 @@ from mayan.celery import app from .classes import DocumentStateHelper, WorkflowAction from .handlers import ( - handler_index_document, handler_trigger_transition, launch_workflow + handler_index_document, handler_launch_workflow, handler_trigger_transition ) from .links import ( link_document_workflow_instance_list, link_setup_workflow_document_types, @@ -352,18 +352,20 @@ class DocumentStatesApp(MayanAppConfig): menu_tools.bind_links(links=(link_tool_launch_all_workflows,)) post_save.connect( - launch_workflow, dispatch_uid='launch_workflow', sender=Document + dispatch_uid='workflows_handler_launch_workflow', + receiver=handler_launch_workflow, + sender=Document ) # Index updating post_save.connect( - handler_index_document, - dispatch_uid='handler_index_document_save', + dispatch_uid='workflows_handler_index_document_save', + receiver=handler_index_document, sender=WorkflowInstanceLogEntry ) post_save.connect( - handler_trigger_transition, - dispatch_uid='document_states_handler_trigger_transition', + dispatch_uid='workflows_handler_trigger_transition', + receiver=handler_trigger_transition, sender=Action ) diff --git a/mayan/apps/document_states/handlers.py b/mayan/apps/document_states/handlers.py index 0d7db30c75..7a1ddc4482 100644 --- a/mayan/apps/document_states/handlers.py +++ b/mayan/apps/document_states/handlers.py @@ -15,6 +15,15 @@ def handler_index_document(sender, **kwargs): ) +def handler_launch_workflow(sender, instance, created, **kwargs): + Workflow = apps.get_model( + app_label='document_states', model_name='Workflow' + ) + + if created: + Workflow.objects.launch_for(instance) + + def handler_trigger_transition(sender, **kwargs): action = kwargs['instance'] @@ -45,12 +54,3 @@ def handler_trigger_transition(sender, **kwargs): comment=_('Event trigger: %s') % EventType.get(name=action.verb).label, transition=valid_transitions[0] ) - - -def launch_workflow(sender, instance, created, **kwargs): - Workflow = apps.get_model( - app_label='document_states', model_name='Workflow' - ) - - if created: - Workflow.objects.launch_for(instance) diff --git a/mayan/apps/permissions/apps.py b/mayan/apps/permissions/apps.py index 24479a8a38..1e96f04042 100644 --- a/mayan/apps/permissions/apps.py +++ b/mayan/apps/permissions/apps.py @@ -15,7 +15,7 @@ from mayan.apps.common.signals import perform_upgrade from mayan.apps.events import ModelEventType from .events import event_role_created, event_role_edited -from .handlers import purge_permissions +from .handlers import handler_purge_permissions from .links import ( link_group_roles, link_role_create, link_role_delete, link_role_edit, link_role_groups, link_role_list, link_role_permissions @@ -77,7 +77,8 @@ class PermissionsApp(MayanAppConfig): menu_setup.bind_links(links=(link_role_list,)) perform_upgrade.connect( - purge_permissions, dispatch_uid='purge_permissions' + dispatch_uid='permissions_handler_purge_permissions', + receiver=handler_purge_permissions ) registry.register(Role) diff --git a/mayan/apps/permissions/handlers.py b/mayan/apps/permissions/handlers.py index 06266c25cc..7f19d4d95c 100644 --- a/mayan/apps/permissions/handlers.py +++ b/mayan/apps/permissions/handlers.py @@ -3,5 +3,5 @@ from __future__ import unicode_literals from django.core import management -def purge_permissions(**kwargs): - management.call_command('purgepermissions') +def handler_purge_permissions(**kwargs): + management.call_command(command_name='purgepermissions')