kallithea Changeset - 24d906650cc0

Changeset - 24d906650cc0

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 14 years ago 2012-03-22 01:35:50
marcin@python-works.com

Don't cast to string on warning about deleting an user who still owns repositories

1 file changed with 3 insertions and 2 deletions:

rhodecode/controllers/admin/users.py

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/users.py

➞

Show inline comments

@@ @@ -136,29 +136,30 @@ class UsersController(BaseController): @@
     def delete(self, id):
         """DELETE /users/id: Delete an existing item"""
         # Forms posted to this method should contain a hidden field:
         #    <input type="hidden" name="_method" value="DELETE" />
         # Or using helpers:
         #    h.form(url('delete_user', id=ID),
         #           method='delete')
         # url('user', id=ID)
         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'))
     def show(self, id, format='html'):
         """GET /users/id: Show a specific item"""
         # url('user', id=ID)
     def edit(self, id, format='html'):
         """GET /users/id/edit: Form to edit an existing item"""
         # url('edit_user', id=ID)
         c.user = User.get(id)

0 comments (0 inline, 0 general)