Mercurial > kallithea

comparison rhodecode/controllers/admin/users.py @ 2165:dc2584ba5fbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
2097:8fd6650bb436 2165:dc2584ba5fbc
143 # method='delete') 143 # method='delete')
144 # url('user', id=ID) 144 # url('user', id=ID)
145 user_model = UserModel() 145 user_model = UserModel()
146 try: 146 try:
147 user_model.delete(id) 147 user_model.delete(id)
148 Session.commit()
148 h.flash(_('successfully deleted user'), category='success') 149 h.flash(_('successfully deleted user'), category='success')
149 Session.commit()
150 except (UserOwnsReposException, DefaultUserException), e: 150 except (UserOwnsReposException, DefaultUserException), e:
151 h.flash(str(e), category='warning') 151 h.flash(e, category='warning')
152 except Exception: 152 except Exception:
153 log.error(traceback.format_exc())
153 h.flash(_('An error occurred during deletion of user'), 154 h.flash(_('An error occurred during deletion of user'),
154 category='error') 155 category='error')
155 return redirect(url('users')) 156 return redirect(url('users'))
156 157
157 def show(self, id, format='html'): 158 def show(self, id, format='html'):