Mercurial > kallithea
diff rhodecode/controllers/admin/users.py @ 2165:dc2584ba5fbc
merged beta into default branch
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Wed, 28 Mar 2012 19:54:16 +0200 |
| parents | 82a88013a3fd 24d906650cc0 |
| children | 63e58ef80ef1 |
line wrap: on
line diff
--- a/rhodecode/controllers/admin/users.py Sat Mar 03 03:41:19 2012 +0200 +++ b/rhodecode/controllers/admin/users.py Wed Mar 28 19:54:16 2012 +0200 @@ -145,11 +145,12 @@ user_model = UserModel() try: user_model.delete(id) + Session.commit() h.flash(_('successfully deleted user'), category='success') - Session.commit() except (UserOwnsReposException, DefaultUserException), e: - h.flash(str(e), category='warning') + h.flash(e, category='warning') except Exception: + log.error(traceback.format_exc()) h.flash(_('An error occurred during deletion of user'), category='error') return redirect(url('users'))