Mercurial > kallithea
diff rhodecode/controllers/admin/users.py @ 2391:91fae60bf2b6 codereview
merge with beta
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Tue, 05 Jun 2012 21:22:23 +0200 |
parents | b0fef8a77568 bc2d8c03c050 |
children | 4ab0e4d478b6 |
line wrap: on
line diff
--- a/rhodecode/controllers/admin/users.py Wed May 30 23:12:24 2012 +0200 +++ b/rhodecode/controllers/admin/users.py Tue Jun 05 21:22:23 2012 +0200 @@ -42,6 +42,7 @@ from rhodecode.model.forms import UserForm from rhodecode.model.user import UserModel from rhodecode.model.meta import Session +from rhodecode.lib.utils import action_logger log = logging.getLogger(__name__) @@ -76,10 +77,12 @@ try: form_result = user_form.to_python(dict(request.POST)) user_model.create(form_result) - h.flash(_('created user %s') % form_result['username'], + usr = form_result['username'] + action_logger(self.rhodecode_user, 'admin_created_user:%s' % usr, + None, self.ip_addr, self.sa) + h.flash(_('created user %s') % usr, category='success') Session.commit() - #action_logger(self.rhodecode_user, 'new_user', '', '', self.sa) except formencode.Invalid, errors: return htmlfill.render( render('admin/users/user_add.html'), @@ -115,6 +118,9 @@ try: form_result = _form.to_python(dict(request.POST)) user_model.update(id, form_result) + usr = form_result['username'] + action_logger(self.rhodecode_user, 'admin_updated_user:%s' % usr, + None, self.ip_addr, self.sa) h.flash(_('User updated successfully'), category='success') Session.commit() except formencode.Invalid, errors: