Fix event commit
Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
This commit is contained in:
@@ -22,7 +22,10 @@ from mayan.apps.metadata import MetadataLookup
|
|||||||
from mayan.apps.navigation import SourceColumn
|
from mayan.apps.navigation import SourceColumn
|
||||||
from mayan.apps.rest_api.fields import DynamicSerializerField
|
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 .handlers import handler_initialize_new_user_options
|
||||||
from .links import (
|
from .links import (
|
||||||
link_current_user_details, link_current_user_edit, link_group_create,
|
link_current_user_details, link_current_user_edit, link_group_create,
|
||||||
@@ -87,7 +90,11 @@ class UserManagementApp(MayanAppConfig):
|
|||||||
)
|
)
|
||||||
|
|
||||||
ModelEventType.register(
|
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(
|
ModelPermission.register(
|
||||||
|
|||||||
@@ -29,18 +29,18 @@ def get_method_group_save():
|
|||||||
group_save_original = Group.save
|
group_save_original = Group.save
|
||||||
|
|
||||||
def method_group_save(self, *args, **kwargs):
|
def method_group_save(self, *args, **kwargs):
|
||||||
_group = kwargs.pop('_group', None)
|
_user = kwargs.pop('_user', None)
|
||||||
|
|
||||||
with transaction.atomic():
|
with transaction.atomic():
|
||||||
is_new = not self.pk
|
is_new = not self.pk
|
||||||
group_save_original(self, *args, **kwargs)
|
group_save_original(self, *args, **kwargs)
|
||||||
if is_new:
|
if is_new:
|
||||||
event_group_created.commit(
|
event_group_created.commit(
|
||||||
actor=_group, target=self
|
actor=_user, target=self
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
event_group_edited.commit(
|
event_group_edited.commit(
|
||||||
actor=_group, target=self
|
actor=_user, target=self
|
||||||
)
|
)
|
||||||
|
|
||||||
return method_group_save
|
return method_group_save
|
||||||
|
|||||||
Reference in New Issue
Block a user