diff --git a/rhodecode/controllers/admin/users_groups.py b/rhodecode/controllers/admin/users_groups.py --- a/rhodecode/controllers/admin/users_groups.py +++ b/rhodecode/controllers/admin/users_groups.py @@ -33,16 +33,16 @@ from pylons.controllers.util import abor from pylons.i18n.translation import _ from rhodecode.lib import helpers as h -from rhodecode.lib.exceptions import UsersGroupsAssignedException +from rhodecode.lib.exceptions import UserGroupsAssignedException from rhodecode.lib.utils2 import safe_unicode, str2bool from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator from rhodecode.lib.base import BaseController, render -from rhodecode.model.users_group import UsersGroupModel +from rhodecode.model.users_group import UserGroupModel -from rhodecode.model.db import User, UsersGroup, UsersGroupToPerm,\ - UsersGroupRepoToPerm, UsersGroupRepoGroupToPerm -from rhodecode.model.forms import UsersGroupForm +from rhodecode.model.db import User, UserGroup, UserGroupToPerm,\ + UserGroupRepoToPerm, UserGroupRepoGroupToPerm +from rhodecode.model.forms import UserGroupForm from rhodecode.model.meta import Session from rhodecode.lib.utils import action_logger from sqlalchemy.orm import joinedload @@ -67,17 +67,17 @@ class UsersGroupsController(BaseControll def index(self, format='html'): """GET /users_groups: All items in the collection""" # url('users_groups') - c.users_groups_list = UsersGroup().query().all() + c.users_groups_list = UserGroup().query().all() return render('admin/users_groups/users_groups.html') def create(self): """POST /users_groups: Create a new item""" # url('users_groups') - users_group_form = UsersGroupForm()() + users_group_form = UserGroupForm()() try: form_result = users_group_form.to_python(dict(request.POST)) - UsersGroupModel().create(name=form_result['users_group_name'], + UserGroupModel().create(name=form_result['users_group_name'], active=form_result['users_group_active']) gr = form_result['users_group_name'] action_logger(self.rhodecode_user, @@ -110,20 +110,20 @@ class UsersGroupsController(BaseControll 'repositories_groups': {} } - ugroup_repo_perms = UsersGroupRepoToPerm.query()\ - .options(joinedload(UsersGroupRepoToPerm.permission))\ - .options(joinedload(UsersGroupRepoToPerm.repository))\ - .filter(UsersGroupRepoToPerm.users_group_id == id)\ + ugroup_repo_perms = UserGroupRepoToPerm.query()\ + .options(joinedload(UserGroupRepoToPerm.permission))\ + .options(joinedload(UserGroupRepoToPerm.repository))\ + .filter(UserGroupRepoToPerm.users_group_id == id)\ .all() for gr in ugroup_repo_perms: c.users_group.permissions['repositories'][gr.repository.repo_name] \ = gr.permission.permission_name - ugroup_group_perms = UsersGroupRepoGroupToPerm.query()\ - .options(joinedload(UsersGroupRepoGroupToPerm.permission))\ - .options(joinedload(UsersGroupRepoGroupToPerm.group))\ - .filter(UsersGroupRepoGroupToPerm.users_group_id == id)\ + ugroup_group_perms = UserGroupRepoGroupToPerm.query()\ + .options(joinedload(UserGroupRepoGroupToPerm.permission))\ + .options(joinedload(UserGroupRepoGroupToPerm.group))\ + .filter(UserGroupRepoGroupToPerm.users_group_id == id)\ .all() for gr in ugroup_group_perms: @@ -145,18 +145,18 @@ class UsersGroupsController(BaseControll # method='put') # url('users_group', id=ID) - c.users_group = UsersGroup.get_or_404(id) + c.users_group = UserGroup.get_or_404(id) self._load_data(id) available_members = [safe_unicode(x[0]) for x in c.available_members] - users_group_form = UsersGroupForm(edit=True, + users_group_form = UserGroupForm(edit=True, old_data=c.users_group.get_dict(), available_members=available_members)() try: form_result = users_group_form.to_python(request.POST) - UsersGroupModel().update(c.users_group, form_result) + UserGroupModel().update(c.users_group, form_result) gr = form_result['users_group_name'] action_logger(self.rhodecode_user, 'admin_updated_users_group:%s' % gr, @@ -164,7 +164,7 @@ class UsersGroupsController(BaseControll h.flash(_('updated user group %s') % gr, category='success') Session().commit() except formencode.Invalid, errors: - ug_model = UsersGroupModel() + ug_model = UserGroupModel() defaults = errors.value e = errors.error_dict or {} defaults.update({ @@ -196,12 +196,12 @@ class UsersGroupsController(BaseControll # h.form(url('users_group', id=ID), # method='delete') # url('users_group', id=ID) - usr_gr = UsersGroup.get_or_404(id) + usr_gr = UserGroup.get_or_404(id) try: - UsersGroupModel().delete(usr_gr) + UserGroupModel().delete(usr_gr) Session().commit() h.flash(_('successfully deleted user group'), category='success') - except UsersGroupsAssignedException, e: + except UserGroupsAssignedException, e: h.flash(e, category='error') except Exception: log.error(traceback.format_exc()) @@ -217,10 +217,10 @@ class UsersGroupsController(BaseControll """GET /users_groups/id/edit: Form to edit an existing item""" # url('edit_users_group', id=ID) - c.users_group = UsersGroup.get_or_404(id) + c.users_group = UserGroup.get_or_404(id) self._load_data(id) - ug_model = UsersGroupModel() + ug_model = UserGroupModel() defaults = c.users_group.get_dict() defaults.update({ 'create_repo_perm': ug_model.has_perm(c.users_group, @@ -240,36 +240,36 @@ class UsersGroupsController(BaseControll """PUT /users_perm/id: Update an existing item""" # url('users_group_perm', id=ID, method='put') - users_group = UsersGroup.get_or_404(id) + users_group = UserGroup.get_or_404(id) grant_create_perm = str2bool(request.POST.get('create_repo_perm')) grant_fork_perm = str2bool(request.POST.get('fork_repo_perm')) inherit_perms = str2bool(request.POST.get('inherit_default_permissions')) - usersgroup_model = UsersGroupModel() + usergroup_model = UserGroupModel() try: users_group.inherit_default_permissions = inherit_perms Session().add(users_group) if grant_create_perm: - usersgroup_model.revoke_perm(id, 'hg.create.none') - usersgroup_model.grant_perm(id, 'hg.create.repository') + usergroup_model.revoke_perm(id, 'hg.create.none') + usergroup_model.grant_perm(id, 'hg.create.repository') h.flash(_("Granted 'repository create' permission to user group"), category='success') else: - usersgroup_model.revoke_perm(id, 'hg.create.repository') - usersgroup_model.grant_perm(id, 'hg.create.none') + usergroup_model.revoke_perm(id, 'hg.create.repository') + usergroup_model.grant_perm(id, 'hg.create.none') h.flash(_("Revoked 'repository create' permission to user group"), category='success') if grant_fork_perm: - usersgroup_model.revoke_perm(id, 'hg.fork.none') - usersgroup_model.grant_perm(id, 'hg.fork.repository') + usergroup_model.revoke_perm(id, 'hg.fork.none') + usergroup_model.grant_perm(id, 'hg.fork.repository') h.flash(_("Granted 'repository fork' permission to user group"), category='success') else: - usersgroup_model.revoke_perm(id, 'hg.fork.repository') - usersgroup_model.grant_perm(id, 'hg.fork.none') + usergroup_model.revoke_perm(id, 'hg.fork.repository') + usergroup_model.grant_perm(id, 'hg.fork.none') h.flash(_("Revoked 'repository fork' permission to user group"), category='success')