diff --git a/rhodecode/controllers/admin/users.py b/rhodecode/controllers/admin/users.py --- a/rhodecode/controllers/admin/users.py +++ b/rhodecode/controllers/admin/users.py @@ -32,7 +32,8 @@ from pylons import request, session, tmp from pylons.controllers.util import abort, redirect from pylons.i18n.translation import _ -from rhodecode.lib.exceptions import DefaultUserException, UserOwnsReposException +from rhodecode.lib.exceptions import DefaultUserException, \ + UserOwnsReposException from rhodecode.lib import helpers as h from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator from rhodecode.lib.base import BaseController, render @@ -43,6 +44,7 @@ from rhodecode.model.user import UserMod log = logging.getLogger(__name__) + class UsersController(BaseController): """REST Controller styled on the Atom Publishing Protocol""" # To properly map this controller, ensure your config/routing.py @@ -105,8 +107,8 @@ class UsersController(BaseController): user_model = UserModel() c.user = user_model.get(id) - _form = UserForm(edit=True, old_data={'user_id':id, - 'email':c.user.email})() + _form = UserForm(edit=True, old_data={'user_id': id, + 'email': c.user.email})() form_result = {} try: form_result = _form.to_python(dict(request.POST)) @@ -150,7 +152,6 @@ class UsersController(BaseController): """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) @@ -162,7 +163,8 @@ class UsersController(BaseController): h.flash(_("You can't edit this user"), category='warning') return redirect(url('users')) c.user.permissions = {} - c.granted_permissions = user_model.fill_perms(c.user).permissions['global'] + c.granted_permissions = user_model.fill_perms(c.user)\ + .permissions['global'] defaults = c.user.get_dict()