Backport support for global and object event notification. GitLab issue #262.
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
@@ -4,7 +4,7 @@ from django.apps import apps
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from document_indexing.tasks import task_index_document
|
||||
from events.classes import Event
|
||||
from events.classes import EventType
|
||||
|
||||
|
||||
def handler_index_document(sender, **kwargs):
|
||||
@@ -42,7 +42,7 @@ def handler_trigger_transition(sender, **kwargs):
|
||||
transition = list(set(trigger_transitions) & set(workflow_instance.get_transition_choices()))[0]
|
||||
|
||||
workflow_instance.do_transition(
|
||||
comment=_('Event trigger: %s') % Event.get(name=action.verb).label,
|
||||
comment=_('Event trigger: %s') % EventType.get(name=action.verb).label,
|
||||
transition=transition
|
||||
)
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ import django.db.models.deletion
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('events', '0001_initial'),
|
||||
('events', '0005_auto_20170731_0452'),
|
||||
('document_states', '0004_workflow_internal_name'),
|
||||
]
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ from django.utils.translation import ugettext_lazy as _
|
||||
from acls.models import AccessControlList
|
||||
from common.validators import validate_internal_name
|
||||
from documents.models import Document, DocumentType
|
||||
from events.models import EventType
|
||||
from events.models import StoredEventType
|
||||
from permissions import Permission
|
||||
|
||||
from .error_logs import error_log_state_actions
|
||||
@@ -306,7 +306,8 @@ class WorkflowTransitionTriggerEvent(models.Model):
|
||||
related_name='trigger_events', verbose_name=_('Transition')
|
||||
)
|
||||
event_type = models.ForeignKey(
|
||||
EventType, on_delete=models.CASCADE, verbose_name=_('Event type')
|
||||
StoredEventType, on_delete=models.CASCADE,
|
||||
verbose_name=_('Event type')
|
||||
)
|
||||
|
||||
class Meta:
|
||||
|
||||
@@ -17,8 +17,8 @@ from common.views import (
|
||||
)
|
||||
from documents.models import Document
|
||||
from documents.views import DocumentListView
|
||||
from events.classes import Event
|
||||
from events.models import EventType
|
||||
from events.classes import EventType
|
||||
from events.models import StoredEventType
|
||||
|
||||
from .classes import WorkflowAction
|
||||
from .forms import (
|
||||
@@ -675,7 +675,7 @@ class WorkflowStateListView(SingleObjectListView):
|
||||
|
||||
class SetupWorkflowTransitionTriggerEventListView(FormView):
|
||||
form_class = WorkflowTransitionTriggerEventRelationshipFormSet
|
||||
submodel = EventType
|
||||
submodel = StoredEventType
|
||||
|
||||
def dispatch(self, *args, **kwargs):
|
||||
messages.warning(
|
||||
@@ -689,7 +689,7 @@ class SetupWorkflowTransitionTriggerEventListView(FormView):
|
||||
user=self.request.user, obj=self.get_object().workflow
|
||||
)
|
||||
|
||||
Event.refresh()
|
||||
EventType.refresh()
|
||||
return super(
|
||||
SetupWorkflowTransitionTriggerEventListView, self
|
||||
).dispatch(*args, **kwargs)
|
||||
@@ -735,8 +735,10 @@ class SetupWorkflowTransitionTriggerEventListView(FormView):
|
||||
initial = []
|
||||
|
||||
# Return the queryset by name from the sorted list of the class
|
||||
event_type_ids = [event_type.name for event_type in Event.all()]
|
||||
event_type_queryset = EventType.objects.filter(name__in=event_type_ids)
|
||||
event_type_ids = [event_type.id for event_type in Event.all()]
|
||||
event_type_queryset = StoredEventType.objects.filter(
|
||||
name__in=event_type_ids
|
||||
)
|
||||
|
||||
for event_type in event_type_queryset:
|
||||
initial.append({
|
||||
|
||||
Reference in New Issue
Block a user