From 3fc463bb1c9c6e5ecc127bb9b3b6bbfc3e636dac Mon Sep 17 00:00:00 2001
From: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
Date: Fri, 22 Feb 2019 04:06:06 -0400
Subject: [PATCH] Fix event commit

Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
---
 mayan/apps/user_management/apps.py    | 11 +++++++++--
 mayan/apps/user_management/methods.py |  6 +++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/mayan/apps/user_management/apps.py b/mayan/apps/user_management/apps.py
index 3580a01c74..5c7bac8565 100644
--- a/mayan/apps/user_management/apps.py
+++ b/mayan/apps/user_management/apps.py
@@ -22,7 +22,10 @@ from mayan.apps.metadata import MetadataLookup
 from mayan.apps.navigation import SourceColumn
 from mayan.apps.rest_api.fields import DynamicSerializerField
 
-from .events import event_user_edited
+from .events import (
+    event_group_created, event_group_edited, event_user_created,
+    event_user_edited
+)
 from .handlers import handler_initialize_new_user_options
 from .links import (
     link_current_user_details, link_current_user_edit, link_group_create,
@@ -87,7 +90,11 @@ class UserManagementApp(MayanAppConfig):
         )
 
         ModelEventType.register(
-            event_types=(event_user_edited,), model=User
+            event_types=(event_group_created, event_group_edited), model=Group
+        )
+
+        ModelEventType.register(
+            event_types=(event_user_created, event_user_edited), model=User
         )
 
         ModelPermission.register(
diff --git a/mayan/apps/user_management/methods.py b/mayan/apps/user_management/methods.py
index 5db28def18..6caca18905 100644
--- a/mayan/apps/user_management/methods.py
+++ b/mayan/apps/user_management/methods.py
@@ -29,18 +29,18 @@ def get_method_group_save():
     group_save_original = Group.save
 
     def method_group_save(self, *args, **kwargs):
-        _group = kwargs.pop('_group', None)
+        _user = kwargs.pop('_user', None)
 
         with transaction.atomic():
             is_new = not self.pk
             group_save_original(self, *args, **kwargs)
             if is_new:
                 event_group_created.commit(
-                    actor=_group, target=self
+                    actor=_user, target=self
                 )
             else:
                 event_group_edited.commit(
-                    actor=_group, target=self
+                    actor=_user, target=self
                 )
 
     return method_group_save