kallithea: rhodecode/controllers/admin/users.py comparison

comparison rhodecode/controllers/admin/users.py @ 2709:d2d35cf2b351 beta

RhodeCode now has a option to explicitly set forking permissions. ref #508 - changed the way permissons on users groups behave. Now explicit set on user is more important than permission set on users group

author	Marcin Kuzminski <marcin@python-works.com>
date	Fri, 10 Aug 2012 03:09:36 +0200
parents	4eef5eeb81a3
children	63e58ef80ef1 b2b93614a7cd

comparison

equal deleted inserted replaced

-:9bce679a3f49
+:d2d35cf2b351
 from formencode import htmlfill
 from pylons import request, session, tmpl_context as c, url, config
 from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
+import rhodecode
 from rhodecode.lib.exceptions import DefaultUserException, \
 UserOwnsReposException
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \
 AuthUser
 from rhodecode.lib.base import BaseController, render
-import rhodecode
+from rhodecode.model.db import User, UserEmailMap
-from rhodecode.model.db import User, Permission, UserEmailMap
 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
 from rhodecode.lib.compat import json
-from rhodecode.lib.utils2 import datetime_to_time
+from rhodecode.lib.utils2 import datetime_to_time, str2bool
 log = logging.getLogger(__name__)
 class UsersController(BaseController):
 except formencode.Invalid, errors:
 c.user_email_map = UserEmailMap.query()\
 .filter(UserEmailMap.user == c.user).all()
 defaults = errors.value
 e = errors.error_dict or {}
-perm = Permission.get_by_key('hg.create.repository')
+defaults.update({
-defaults.update({'create_repo_perm': user_model.has_perm(id, perm)})
+'create_repo_perm': user_model.has_perm(id, 'hg.create.repository'),
-defaults.update({'_method': 'put'})
+'fork_repo_perm': user_model.has_perm(id, 'hg.fork.repository'),
+'_method': 'put'
+})
 return htmlfill.render(
 render('admin/users/user_edit.html'),
 defaults=defaults,
 errors=e,
 prefix_error=False,
 encoding="UTF-8")
 except Exception:
 log.error(traceback.format_exc())
 h.flash(_('error occurred during update of user %s') \
 % form_result.get('username'), category='error')
-return redirect(url('users'))
+return redirect(url('edit_user', id=id))
 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()
+usr = User.get_or_404(id)
 try:
-user_model.delete(id)
+UserModel().delete(usr)
 Session().commit()
 h.flash(_('successfully deleted user'), category='success')
 except (UserOwnsReposException, DefaultUserException), e:
 h.flash(e, category='warning')
 except Exception:
 c.user = User.get_or_404(id)
 if c.user.username == 'default':
 h.flash(_("You can't edit this user"), category='warning')
 return redirect(url('users'))
 c.perm_user = AuthUser(user_id=id)
 c.user.permissions = {}
 c.granted_permissions = UserModel().fill_perms(c.user)\
 .permissions['global']
 c.user_email_map = UserEmailMap.query()\
 .filter(UserEmailMap.user == c.user).all()
+user_model = UserModel()
 defaults = c.user.get_dict()
-perm = Permission.get_by_key('hg.create.repository')
+defaults.update({
-defaults.update({'create_repo_perm': UserModel().has_perm(id, perm)})
+'create_repo_perm': user_model.has_perm(id, 'hg.create.repository'),
+'fork_repo_perm': user_model.has_perm(id, 'hg.fork.repository'),
+})
 return htmlfill.render(
 render('admin/users/user_edit.html'),
 defaults=defaults,
 encoding="UTF-8",
 )
 def update_perm(self, id):
 """PUT /users_perm/id: Update an existing item"""
 # url('user_perm', id=ID, method='put')
+usr = User.get_or_404(id)
-grant_perm = request.POST.get('create_repo_perm', False)
+grant_create_perm = str2bool(request.POST.get('create_repo_perm'))
-user_model = UserModel()
+grant_fork_perm = str2bool(request.POST.get('fork_repo_perm'))
+inherit_perms = str2bool(request.POST.get('inherit_default_permissions'))
-if grant_perm:
-perm = Permission.get_by_key('hg.create.none')
+user_model = UserModel()
-user_model.revoke_perm(id, perm)
+try:
-perm = Permission.get_by_key('hg.create.repository')
+usr.inherit_default_permissions = inherit_perms
-user_model.grant_perm(id, perm)
+Session().add(usr)
-h.flash(_("Granted 'repository create' permission to user"),
-category='success')
+if grant_create_perm:
-Session().commit()
+user_model.revoke_perm(usr, 'hg.create.none')
-else:
+user_model.grant_perm(usr, 'hg.create.repository')
-perm = Permission.get_by_key('hg.create.repository')
+h.flash(_("Granted 'repository create' permission to user"),
-user_model.revoke_perm(id, perm)
+category='success')
+else:
-perm = Permission.get_by_key('hg.create.none')
+user_model.revoke_perm(usr, 'hg.create.repository')
-user_model.grant_perm(id, perm)
+user_model.grant_perm(usr, 'hg.create.none')
 h.flash(_("Revoked 'repository create' permission to user"),
 category='success')
-Session().commit()
+if grant_fork_perm:
+user_model.revoke_perm(usr, 'hg.fork.none')
+user_model.grant_perm(usr, 'hg.fork.repository')
+h.flash(_("Granted 'repository fork' permission to user"),
+category='success')
+else:
+user_model.revoke_perm(usr, 'hg.fork.repository')
+user_model.grant_perm(usr, 'hg.fork.none')
+h.flash(_("Revoked 'repository fork' permission to user"),
+category='success')
+Session().commit()
+except Exception:
+log.error(traceback.format_exc())
+h.flash(_('An error occurred during permissions saving'),
+category='error')
 return redirect(url('edit_user', id=id))
 def add_email(self, id):
 """POST /user_emails:Add an existing item"""
 # url('user_emails', id=ID, method='put')

Mercurial > kallithea

comparison rhodecode/controllers/admin/users.py @ 2709:d2d35cf2b351 beta