Add group create and edit events
Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
This commit is contained in:
@@ -8,6 +8,13 @@ namespace = EventTypeNamespace(
|
|||||||
name='user_management', label=_('User management')
|
name='user_management', label=_('User management')
|
||||||
)
|
)
|
||||||
|
|
||||||
|
event_group_created = namespace.add_event_type(
|
||||||
|
label=_('Group created'), name='created'
|
||||||
|
)
|
||||||
|
event_group_edited = namespace.add_event_type(
|
||||||
|
label=_('Group edited'), name='edited'
|
||||||
|
)
|
||||||
|
|
||||||
event_user_created = namespace.add_event_type(
|
event_user_created = namespace.add_event_type(
|
||||||
label=_('User created'), name='created'
|
label=_('User created'), name='created'
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ from .utils import get_user_label_text
|
|||||||
|
|
||||||
|
|
||||||
def condition_is_not_superuser(context):
|
def condition_is_not_superuser(context):
|
||||||
user = context['resolved_object']
|
user = context['object']
|
||||||
return not user.is_superuser and not user.is_staff
|
return not user.is_superuser and not user.is_staff
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,10 @@ from mayan.apps.common.views import (
|
|||||||
SingleObjectListView
|
SingleObjectListView
|
||||||
)
|
)
|
||||||
|
|
||||||
from .events import event_user_created, event_user_edited
|
from .events import (
|
||||||
|
event_group_created, event_group_edited, event_user_created,
|
||||||
|
event_user_edited
|
||||||
|
)
|
||||||
from .forms import UserForm
|
from .forms import UserForm
|
||||||
from .icons import icon_group_setup, icon_user_setup
|
from .icons import icon_group_setup, icon_user_setup
|
||||||
from .links import link_group_create, link_user_create
|
from .links import link_group_create, link_user_create
|
||||||
@@ -62,6 +65,18 @@ class GroupCreateView(SingleObjectCreateView):
|
|||||||
post_action_redirect = reverse_lazy('user_management:group_list')
|
post_action_redirect = reverse_lazy('user_management:group_list')
|
||||||
view_permission = permission_group_create
|
view_permission = permission_group_create
|
||||||
|
|
||||||
|
def form_valid(self, form):
|
||||||
|
group = form.save()
|
||||||
|
|
||||||
|
event_group_created.commit(
|
||||||
|
actor=self.request.user, target=group
|
||||||
|
)
|
||||||
|
|
||||||
|
messages.success(
|
||||||
|
self.request, _('Group "%s" created successfully.') % group
|
||||||
|
)
|
||||||
|
return super(GroupCreateView, self).form_valid(form=form)
|
||||||
|
|
||||||
|
|
||||||
class GroupEditView(SingleObjectEditView):
|
class GroupEditView(SingleObjectEditView):
|
||||||
fields = ('name',)
|
fields = ('name',)
|
||||||
@@ -69,6 +84,12 @@ class GroupEditView(SingleObjectEditView):
|
|||||||
object_permission = permission_group_edit
|
object_permission = permission_group_edit
|
||||||
post_action_redirect = reverse_lazy('user_management:group_list')
|
post_action_redirect = reverse_lazy('user_management:group_list')
|
||||||
|
|
||||||
|
def form_valid(self, form):
|
||||||
|
event_group_edited.commit(
|
||||||
|
actor=self.request.user, target=self.get_object()
|
||||||
|
)
|
||||||
|
return super(GroupEditView, self).form_valid(form=form)
|
||||||
|
|
||||||
def get_extra_context(self):
|
def get_extra_context(self):
|
||||||
return {
|
return {
|
||||||
'object': self.get_object(),
|
'object': self.get_object(),
|
||||||
|
|||||||
Reference in New Issue
Block a user