Mercurial > kallithea

comparison rhodecode/controllers/admin/users_groups.py @ 2375:bc2d8c03c050 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Implemented #467 Journal logs comments on changesets - added created/updated user action to journal - added created/updated users group action journal - added ip adresses to most of action_log calls to track IP changes - rewrote action_parser to simpler and more efficient solution
author Marcin Kuzminski <marcin@python-works.com>
date Sun, 03 Jun 2012 00:40:14 +0200
parents 8ecfed1d8f8b
children 91c442a489bb
comparison
equal deleted inserted replaced
2374:be2163ef127e 2375:bc2d8c03c050
41 from rhodecode.model.users_group import UsersGroupModel 41 from rhodecode.model.users_group import UsersGroupModel
42 42
43 from rhodecode.model.db import User, UsersGroup, Permission, UsersGroupToPerm 43 from rhodecode.model.db import User, UsersGroup, Permission, UsersGroupToPerm
44 from rhodecode.model.forms import UsersGroupForm 44 from rhodecode.model.forms import UsersGroupForm
45 from rhodecode.model.meta import Session 45 from rhodecode.model.meta import Session
46 from rhodecode.lib.utils import action_logger
46 47
47 log = logging.getLogger(__name__) 48 log = logging.getLogger(__name__)
48 49
49 50
50 class UsersGroupsController(BaseController): 51 class UsersGroupsController(BaseController):
74 users_group_form = UsersGroupForm()() 75 users_group_form = UsersGroupForm()()
75 try: 76 try:
76 form_result = users_group_form.to_python(dict(request.POST)) 77 form_result = users_group_form.to_python(dict(request.POST))
77 UsersGroupModel().create(name=form_result['users_group_name'], 78 UsersGroupModel().create(name=form_result['users_group_name'],
78 active=form_result['users_group_active']) 79 active=form_result['users_group_active'])
79 h.flash(_('created users group %s') \ 80 gr = form_result['users_group_name']
80 % form_result['users_group_name'], category='success') 81 action_logger(self.rhodecode_user,
81 #action_logger(self.rhodecode_user, 'new_user', '', '', self.sa) 82 'admin_created_users_group:%s' % gr,
83 None, self.ip_addr, self.sa)
84 h.flash(_('created users group %s') % gr, category='success')
82 Session.commit() 85 Session.commit()
83 except formencode.Invalid, errors: 86 except formencode.Invalid, errors:
84 return htmlfill.render( 87 return htmlfill.render(
85 render('admin/users_groups/users_group_add.html'), 88 render('admin/users_groups/users_group_add.html'),
86 defaults=errors.value, 89 defaults=errors.value,
123 available_members=available_members)() 126 available_members=available_members)()
124 127
125 try: 128 try:
126 form_result = users_group_form.to_python(request.POST) 129 form_result = users_group_form.to_python(request.POST)
127 UsersGroupModel().update(c.users_group, form_result) 130 UsersGroupModel().update(c.users_group, form_result)
128 h.flash(_('updated users group %s') \ 131 gr = form_result['users_group_name']
129 % form_result['users_group_name'], 132 action_logger(self.rhodecode_user,
130 category='success') 133 'admin_updated_users_group:%s' % gr,
131 #action_logger(self.rhodecode_user, 'new_user', '', '', self.sa) 134 None, self.ip_addr, self.sa)
135 h.flash(_('updated users group %s') % gr, category='success')
132 Session.commit() 136 Session.commit()
133 except formencode.Invalid, errors: 137 except formencode.Invalid, errors:
134 e = errors.error_dict or {} 138 e = errors.error_dict or {}
135 139
136 perm = Permission.get_by_key('hg.create.repository') 140 perm = Permission.get_by_key('hg.create.repository')