# HG changeset patch # User Mads Kiilerich # Date 2013-02-27 00:28:00 # Node ID 5f1850e4712a63be3a455a8d8fce683acdd9d781 # Parent 3c8d8725333f480a64fea89e4209689b25a017db "Users groups" is grammatically incorrect English - rename to "user groups" - and same story with "repositories groups" This will only change the user facing texts. Names of files, modules, functions and variables should be changed too. diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -75,7 +75,7 @@ RhodeCode Features - Supports http/https, LDAP, AD, proxy-pass authentication. - Full permissions (private/read/write/admin) together with IP restrictions for each repository, additional explicit forking and repository creation permissions. -- Users groups for easier permission management +- User groups for easier permission management - Repository groups let you group repos and manage them easier. - Users can fork other users repos, and compare them at any time. - Integrates easily with other systems, with custom created mappers you can connect it to almost diff --git a/docs/api/api.rst b/docs/api/api.rst --- a/docs/api/api.rst +++ b/docs/api/api.rst @@ -436,7 +436,7 @@ OUTPUT:: get_users_group --------------- -Gets an existing users group. This command can be executed only using api_key +Gets an existing user group. This command can be executed only using api_key belonging to user with admin rights. @@ -446,7 +446,7 @@ INPUT:: api_key : "" method : "get_users_group" args : { - "usersgroupid" : "" + "usersgroupid" : "" } OUTPUT:: @@ -479,7 +479,7 @@ OUTPUT:: get_users_groups ---------------- -Lists all existing users groups. This command can be executed only using +Lists all existing user groups. This command can be executed only using api_key belonging to user with admin rights. @@ -507,7 +507,7 @@ OUTPUT:: create_users_group ------------------ -Creates new users group. This command can be executed only using api_key +Creates new user group. This command can be executed only using api_key belonging to user with admin rights @@ -525,7 +525,7 @@ OUTPUT:: id : result: { - "msg": "created new users group ``", + "msg": "created new user group ``", "users_group": { "users_group_id" : "", "group_name" : "", @@ -538,7 +538,7 @@ OUTPUT:: add_user_to_users_group ----------------------- -Adds a user to a users group. If user exists in that group success will be +Adds a user to a user group. If user exists in that group success will be `false`. This command can be executed only using api_key belonging to user with admin rights @@ -549,7 +549,7 @@ INPUT:: api_key : "" method : "add_user_users_group" args: { - "usersgroupid" : "", + "usersgroupid" : "", "userid" : "", } @@ -558,7 +558,7 @@ OUTPUT:: id : result: { "success": True|False # depends on if member is in group - "msg": "added member `` to users group `` | + "msg": "added member `` to user group `` | User is already in that group" } error: null @@ -567,7 +567,7 @@ OUTPUT:: remove_user_from_users_group ---------------------------- -Removes a user from a users group. If user is not in given group success will +Removes a user from a user group. If user is not in given group success will be `false`. This command can be executed only using api_key belonging to user with admin rights @@ -578,7 +578,7 @@ INPUT:: api_key : "" method : "remove_user_from_users_group" args: { - "usersgroupid" : "", + "usersgroupid" : "", "userid" : "", } @@ -587,7 +587,7 @@ OUTPUT:: id : result: { "success": True|False, # depends on if member is in group - "msg": "removed member from users group | + "msg": "removed member from user group | User wasn't in group" } error: null @@ -929,7 +929,7 @@ OUTPUT:: grant_users_group_permission ---------------------------- -Grant permission for users group on given repository, or update +Grant permission for user group on given repository, or update existing one if found. This command can be executed only using api_key belonging to user with admin rights. @@ -941,7 +941,7 @@ INPUT:: method : "grant_users_group_permission" args: { "repoid" : "" - "usersgroupid" : "" + "usersgroupid" : "" "perm" : "(repository.(none|read|write|admin))", } @@ -958,7 +958,7 @@ OUTPUT:: revoke_users_group_permission ----------------------------- -Revoke permission for users group on given repository.This command can be +Revoke permission for user group on given repository.This command can be executed only using api_key belonging to user with admin rights. INPUT:: @@ -968,7 +968,7 @@ INPUT:: method : "revoke_users_group_permission" args: { "repoid" : "" - "usersgroupid" : "" + "usersgroupid" : "" } OUTPUT:: diff --git a/docs/changelog.rst b/docs/changelog.rst --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -196,7 +196,7 @@ news fixes +++++ -- fixed #570 explicit users group permissions can overwrite owner permissions +- fixed #570 explicit user group permissions can overwrite owner permissions - fixed #578 set proper PATH with current Python for Git hooks to execute within same Python as RhodeCode - fixed issue with Git bare repos that ends with .git in name @@ -385,7 +385,7 @@ news - created rcextensions module with additional mappings (ref #322) and post push/pull/create repo hooks callbacks - implemented #377 Users view for his own permissions on account page -- #399 added inheritance of permissions for users group on repos groups +- #399 added inheritance of permissions for user group on repos groups - #401 repository group is automatically pre-selected when adding repos inside a repository group - added alternative HTTP 403 response when client failed to authenticate. Helps @@ -654,7 +654,7 @@ news - implemented #93 customizable changelog on combined revision ranges - equivalent of githubs compare view - implemented #108 extended and more powerful LDAP configuration -- implemented #56 users groups +- implemented #56 user groups - major code rewrites optimized codes for speed and memory usage - raw and diff downloads are now in git format - setup command checks for write access to given path diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py --- a/rhodecode/config/routing.py +++ b/rhodecode/config/routing.py @@ -235,7 +235,7 @@ def make_map(config): m.connect("user_ips_delete", "/users_ips/{id}", action="delete_ip", conditions=dict(method=["DELETE"])) - #ADMIN USERS GROUPS REST ROUTES + #ADMIN USER GROUPS REST ROUTES with rmap.submapper(path_prefix=ADMIN_PREFIX, controller='admin/users_groups') as m: m.connect("users_groups", "/users_groups", diff --git a/rhodecode/controllers/admin/repos.py b/rhodecode/controllers/admin/repos.py --- a/rhodecode/controllers/admin/repos.py +++ b/rhodecode/controllers/admin/repos.py @@ -345,7 +345,7 @@ class ReposController(BaseRepoController @HasRepoPermissionAllDecorator('repository.admin') def delete_perm_users_group(self, repo_name): """ - DELETE an existing repository permission users group + DELETE an existing repository permission user group :param repo_name: """ @@ -358,7 +358,7 @@ class ReposController(BaseRepoController except Exception: log.error(traceback.format_exc()) h.flash(_('An error occurred during deletion of repository' - ' users groups'), + ' user groups'), category='error') raise HTTPInternalServerError() diff --git a/rhodecode/controllers/admin/repos_groups.py b/rhodecode/controllers/admin/repos_groups.py --- a/rhodecode/controllers/admin/repos_groups.py +++ b/rhodecode/controllers/admin/repos_groups.py @@ -3,7 +3,7 @@ rhodecode.controllers.admin.repos_groups ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Repositories groups controller for RhodeCode + Repository groups controller for RhodeCode :created_on: Mar 23, 2010 :author: marcink @@ -282,7 +282,7 @@ class ReposGroupsController(BaseControll @HasReposGroupPermissionAnyDecorator('group.admin') def delete_repos_group_user_perm(self, group_name): """ - DELETE an existing repositories group permission user + DELETE an existing repository group permission user :param group_name: """ @@ -307,7 +307,7 @@ class ReposGroupsController(BaseControll @HasReposGroupPermissionAnyDecorator('group.admin') def delete_repos_group_users_group_perm(self, group_name): """ - DELETE an existing repositories group permission users group + DELETE an existing repository group permission user group :param group_name: """ @@ -322,7 +322,7 @@ class ReposGroupsController(BaseControll except Exception: log.error(traceback.format_exc()) h.flash(_('An error occurred during deletion of group' - ' users groups'), + ' user groups'), category='error') raise HTTPInternalServerError() 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 @@ -3,7 +3,7 @@ rhodecode.controllers.admin.users_groups ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Users Groups crud controller for pylons + User Groups crud controller for pylons :created_on: Jan 25, 2011 :author: marcink @@ -83,7 +83,7 @@ class UsersGroupsController(BaseControll action_logger(self.rhodecode_user, 'admin_created_users_group:%s' % gr, None, self.ip_addr, self.sa) - h.flash(_('created users group %s') % gr, category='success') + h.flash(_('created user group %s') % gr, category='success') Session().commit() except formencode.Invalid, errors: return htmlfill.render( @@ -94,7 +94,7 @@ class UsersGroupsController(BaseControll encoding="UTF-8") except Exception: log.error(traceback.format_exc()) - h.flash(_('error occurred during creation of users group %s') \ + h.flash(_('error occurred during creation of user group %s') \ % request.POST.get('users_group_name'), category='error') return redirect(url('users_groups')) @@ -161,7 +161,7 @@ class UsersGroupsController(BaseControll action_logger(self.rhodecode_user, 'admin_updated_users_group:%s' % gr, None, self.ip_addr, self.sa) - h.flash(_('updated users group %s') % gr, category='success') + h.flash(_('updated user group %s') % gr, category='success') Session().commit() except formencode.Invalid, errors: ug_model = UsersGroupModel() @@ -183,7 +183,7 @@ class UsersGroupsController(BaseControll encoding="UTF-8") except Exception: log.error(traceback.format_exc()) - h.flash(_('error occurred during update of users group %s') \ + h.flash(_('error occurred during update of user group %s') \ % request.POST.get('users_group_name'), category='error') return redirect(url('edit_users_group', id=id)) @@ -200,12 +200,12 @@ class UsersGroupsController(BaseControll try: UsersGroupModel().delete(usr_gr) Session().commit() - h.flash(_('successfully deleted users group'), category='success') + h.flash(_('successfully deleted user group'), category='success') except UsersGroupsAssignedException, e: h.flash(e, category='error') except Exception: log.error(traceback.format_exc()) - h.flash(_('An error occurred during deletion of users group'), + h.flash(_('An error occurred during deletion of user group'), category='error') return redirect(url('users_groups')) @@ -254,23 +254,23 @@ class UsersGroupsController(BaseControll if grant_create_perm: usersgroup_model.revoke_perm(id, 'hg.create.none') usersgroup_model.grant_perm(id, 'hg.create.repository') - h.flash(_("Granted 'repository create' permission to users group"), + 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') - h.flash(_("Revoked 'repository create' permission to users group"), + 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') - h.flash(_("Granted 'repository fork' permission to users group"), + 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') - h.flash(_("Revoked 'repository fork' permission to users group"), + h.flash(_("Revoked 'repository fork' permission to user group"), category='success') Session().commit() diff --git a/rhodecode/controllers/api/api.py b/rhodecode/controllers/api/api.py --- a/rhodecode/controllers/api/api.py +++ b/rhodecode/controllers/api/api.py @@ -121,13 +121,13 @@ def get_repo_or_error(repoid): def get_users_group_or_error(usersgroupid): """ - Get users group by id or name or return JsonRPCError if not found + Get user group by id or name or return JsonRPCError if not found :param userid: """ users_group = UsersGroupModel().get_group(usersgroupid) if users_group is None: - raise JSONRPCError('users group `%s` does not exist' % usersgroupid) + raise JSONRPCError('user group `%s` does not exist' % usersgroupid) return users_group @@ -449,7 +449,7 @@ class ApiController(JSONRPCController): @HasPermissionAllDecorator('hg.admin') def get_users_group(self, apiuser, usersgroupid): """" - Get users group by name or id + Get user group by name or id :param apiuser: :param usersgroupid: @@ -468,7 +468,7 @@ class ApiController(JSONRPCController): @HasPermissionAllDecorator('hg.admin') def get_users_groups(self, apiuser): """" - Get all users groups + Get all user groups :param apiuser: """ @@ -489,14 +489,14 @@ class ApiController(JSONRPCController): """ if UsersGroupModel().get_by_name(group_name): - raise JSONRPCError("users group `%s` already exist" % group_name) + raise JSONRPCError("user group `%s` already exist" % group_name) try: active = Optional.extract(active) ug = UsersGroupModel().create(name=group_name, active=active) Session().commit() return dict( - msg='created new users group `%s`' % group_name, + msg='created new user group `%s`' % group_name, users_group=ug.get_api_data() ) except Exception: @@ -506,7 +506,7 @@ class ApiController(JSONRPCController): @HasPermissionAllDecorator('hg.admin') def add_user_to_users_group(self, apiuser, usersgroupid, userid): """" - Add a user to a users group + Add a user to a user group :param apiuser: :param usersgroupid: @@ -518,7 +518,7 @@ class ApiController(JSONRPCController): try: ugm = UsersGroupModel().add_user_to_group(users_group, user) success = True if ugm != True else False - msg = 'added member `%s` to users group `%s`' % ( + msg = 'added member `%s` to user group `%s`' % ( user.username, users_group.users_group_name ) msg = msg if success else 'User is already in that group' @@ -531,7 +531,7 @@ class ApiController(JSONRPCController): except Exception: log.error(traceback.format_exc()) raise JSONRPCError( - 'failed to add member to users group `%s`' % ( + 'failed to add member to user group `%s`' % ( users_group.users_group_name ) ) @@ -551,7 +551,7 @@ class ApiController(JSONRPCController): try: success = UsersGroupModel().remove_user_from_group(users_group, user) - msg = 'removed member `%s` from users group `%s`' % ( + msg = 'removed member `%s` from user group `%s`' % ( user.username, users_group.users_group_name ) msg = msg if success else "User wasn't in group" @@ -560,7 +560,7 @@ class ApiController(JSONRPCController): except Exception: log.error(traceback.format_exc()) raise JSONRPCError( - 'failed to remove member from users group `%s`' % ( + 'failed to remove member from user group `%s`' % ( users_group.users_group_name ) ) @@ -890,7 +890,7 @@ class ApiController(JSONRPCController): def grant_users_group_permission(self, apiuser, repoid, usersgroupid, perm): """ - Grant permission for users group on given repository, or update + Grant permission for user group on given repository, or update existing one if found :param apiuser: @@ -909,7 +909,7 @@ class ApiController(JSONRPCController): Session().commit() return dict( - msg='Granted perm: `%s` for users group: `%s` in ' + msg='Granted perm: `%s` for user group: `%s` in ' 'repo: `%s`' % ( perm.permission_name, users_group.users_group_name, repo.repo_name @@ -919,7 +919,7 @@ class ApiController(JSONRPCController): except Exception: log.error(traceback.format_exc()) raise JSONRPCError( - 'failed to edit permission for users group: `%s` in ' + 'failed to edit permission for user group: `%s` in ' 'repo: `%s`' % ( usersgroupid, repo.repo_name ) @@ -928,7 +928,7 @@ class ApiController(JSONRPCController): @HasPermissionAllDecorator('hg.admin') def revoke_users_group_permission(self, apiuser, repoid, usersgroupid): """ - Revoke permission for users group on given repository + Revoke permission for user group on given repository :param apiuser: :param repoid: @@ -943,7 +943,7 @@ class ApiController(JSONRPCController): Session().commit() return dict( - msg='Revoked perm for users group: `%s` in repo: `%s`' % ( + msg='Revoked perm for user group: `%s` in repo: `%s`' % ( users_group.users_group_name, repo.repo_name ), success=True @@ -951,7 +951,7 @@ class ApiController(JSONRPCController): except Exception: log.error(traceback.format_exc()) raise JSONRPCError( - 'failed to edit permission for users group: `%s` in ' + 'failed to edit permission for user group: `%s` in ' 'repo: `%s`' % ( users_group.users_group_name, repo.repo_name ) diff --git a/rhodecode/model/repos_group.py b/rhodecode/model/repos_group.py --- a/rhodecode/model/repos_group.py +++ b/rhodecode/model/repos_group.py @@ -3,7 +3,7 @@ rhodecode.model.user_group ~~~~~~~~~~~~~~~~~~~~~~~~~~ - users groups model for RhodeCode + repo group model for RhodeCode :created_on: Jan 25, 2011 :author: marcink @@ -218,7 +218,7 @@ class ReposGroupModel(BaseModel): if member_type == 'user': # this updates also current one if found _set_perm_user(obj, user=member, perm=perm) - ## set for users group + ## set for user group else: _set_perm_group(obj, users_group=member, perm=perm) # set new permissions @@ -289,11 +289,11 @@ class ReposGroupModel(BaseModel): def delete_permission(self, repos_group, obj, obj_type, recursive): """ Revokes permission for repos_group for given obj(user or users_group), - obj_type can be user or users group + obj_type can be user or user group :param repos_group: - :param obj: user or users group id - :param obj_type: user or users group type + :param obj: user or user group id + :param obj_type: user or user group type :param recursive: recurse to all children of group """ from rhodecode.model.repo import RepoModel @@ -376,13 +376,13 @@ class ReposGroupModel(BaseModel): def grant_users_group_permission(self, repos_group, group_name, perm): """ - Grant permission for users group on given repositories group, or update + Grant permission for user group on given repositories group, or update existing one if found :param repos_group: Instance of ReposGroup, repositories_group_id, or repositories_group name :param group_name: Instance of UserGroup, users_group_id, - or users group name + or user group name :param perm: Instance of Permission, or permission_name """ repos_group = self._get_repos_group(repos_group) @@ -407,12 +407,12 @@ class ReposGroupModel(BaseModel): def revoke_users_group_permission(self, repos_group, group_name): """ - Revoke permission for users group on given repositories group + Revoke permission for user group on given repositories group :param repos_group: Instance of ReposGroup, repositories_group_id, or repositories_group name :param group_name: Instance of UserGroup, users_group_id, - or users group name + or user group name """ repos_group = self._get_repos_group(repos_group) group_name = self.__get_users_group(group_name) diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py --- a/rhodecode/model/user.py +++ b/rhodecode/model/user.py @@ -464,7 +464,7 @@ class UserModel(BaseModel): p = 'repository.admin' user.permissions[RK][r_k] = p - # repositories groups + # repository groups for perm in default_repo_groups_perms: rg_k = perm.UserRepoGroupToPerm.group.group_name p = 'group.admin' @@ -497,7 +497,7 @@ class UserModel(BaseModel): user.permissions[RK][r_k] = p - # defaults for repositories groups taken from default user permission + # defaults for repository groups taken from default user permission # on given group for perm in default_repo_groups_perms: rg_k = perm.UserRepoGroupToPerm.group.group_name @@ -610,7 +610,7 @@ class UserModel(BaseModel): user.permissions[RK][r_k] = p #====================================================================== - # !! PERMISSIONS FOR REPOSITORIES GROUPS !! + # !! PERMISSIONS FOR REPOSITORY GROUPS !! #====================================================================== #====================================================================== # check if user is part of user groups for this repository groups and diff --git a/rhodecode/model/users_group.py b/rhodecode/model/users_group.py --- a/rhodecode/model/users_group.py +++ b/rhodecode/model/users_group.py @@ -3,7 +3,7 @@ rhodecode.model.users_group ~~~~~~~~~~~~~~~~~~~~~~~~~~~ - users group model for RhodeCode + user group model for RhodeCode :created_on: Oct 1, 2011 :author: nvinot diff --git a/rhodecode/templates/admin/repos/repo_edit_perms.html b/rhodecode/templates/admin/repos/repo_edit_perms.html --- a/rhodecode/templates/admin/repos/repo_edit_perms.html +++ b/rhodecode/templates/admin/repos/repo_edit_perms.html @@ -38,7 +38,7 @@ %endif %endfor - ## USERS GROUPS + ## USER GROUPS %for g2p in c.repo_info.users_group_to_perm: ${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.none')} @@ -109,7 +109,7 @@ function ajaxActionUsersGroup(users_grou tr.parentNode.removeChild(tr); }, failure:function(o){ - alert("${_('Failed to remove users group')}"); + alert("${_('Failed to remove user group')}"); }, }; var postData = '_method=delete&users_group_id='+users_group_id; diff --git a/rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html b/rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html --- a/rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html +++ b/rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html @@ -40,7 +40,7 @@ %endfor - ## USERS GROUPS + ## USER GROUPS %for g2p in c.repos_group.users_group_to_perm: ${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'group.none')} @@ -113,7 +113,7 @@ function ajaxActionUsersGroup(users_grou tr.parentNode.removeChild(tr); }, failure:function(o){ - alert("${_('Failed to remove users group')}"); + alert("${_('Failed to remove user group')}"); }, }; var recursive = YUD.get('recursive').checked; diff --git a/rhodecode/templates/admin/repos_groups/repos_groups_show.html b/rhodecode/templates/admin/repos_groups/repos_groups_show.html --- a/rhodecode/templates/admin/repos_groups/repos_groups_show.html +++ b/rhodecode/templates/admin/repos_groups/repos_groups_show.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Repositories groups administration')} - ${c.rhodecode_name} + ${_('Repository groups administration')} - ${c.rhodecode_name} @@ -48,7 +48,7 @@
- ${_('Repositories group')} + ${_('Repository group')} ${h.link_to(h.literal(' » '.join(map(h.safe_unicode,[g.name for g in gr.parents+[gr]]))), url('repos_group_home',group_name=gr.group_name))}
@@ -69,7 +69,7 @@ % else: - ${_('There are no repositories groups yet')} + ${_('There are no repository groups yet')} % endif diff --git a/rhodecode/templates/admin/users_groups/users_group_add.html b/rhodecode/templates/admin/users_groups/users_group_add.html --- a/rhodecode/templates/admin/users_groups/users_group_add.html +++ b/rhodecode/templates/admin/users_groups/users_group_add.html @@ -2,14 +2,14 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Add users group')} - ${c.rhodecode_name} + ${_('Add user group')} - ${c.rhodecode_name} <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))} » - ${h.link_to(_('Users groups'),h.url('users_groups'))} + ${h.link_to(_('User groups'),h.url('users_groups'))} » - ${_('add new users group')} + ${_('add new user group')} <%def name="page_nav()"> diff --git a/rhodecode/templates/admin/users_groups/users_groups.html b/rhodecode/templates/admin/users_groups/users_groups.html --- a/rhodecode/templates/admin/users_groups/users_groups.html +++ b/rhodecode/templates/admin/users_groups/users_groups.html @@ -2,13 +2,13 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Users groups administration')} - ${c.rhodecode_name} + ${_('User groups administration')} - ${c.rhodecode_name} <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))} » - ${_('users groups')} + ${_('user groups')} <%def name="page_nav()"> @@ -44,7 +44,7 @@ ${h.form(url('users_group', id=u_group.users_group_id),method='delete')} ${h.submit('remove_',_('delete'),id="remove_group_%s" % u_group.users_group_id, - class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this users group: %s') % u_group.users_group_name+"');")} + class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this user group: %s') % u_group.users_group_name+"');")} ${h.end_form()} diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html --- a/rhodecode/templates/base/base.html +++ b/rhodecode/templates/base/base.html @@ -240,9 +240,9 @@
  • ${h.link_to(_('admin journal'),h.url('admin_home'),class_='journal')}
  • ${h.link_to(_('repositories'),h.url('repos'),class_='repos')}
    • -
  • ${h.link_to(_('repositories groups'),h.url('repos_groups'),class_='repos_groups')}
    • +
  • ${h.link_to(_('repository groups'),h.url('repos_groups'),class_='repos_groups')}
  • ${h.link_to(_('users'),h.url('users'),class_='users')}
    • -
  • ${h.link_to(_('users groups'),h.url('users_groups'),class_='groups')}
    • +
  • ${h.link_to(_('user groups'),h.url('users_groups'),class_='groups')}
  • ${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}
  • ${h.link_to(_('ldap'),h.url('ldap_home'),class_='ldap')}
  • ${h.link_to(_('defaults'),h.url('defaults'),class_='defaults')}
    • @@ -258,7 +258,7 @@ ${h.link_to(_('admin'),h.url('admin_home'),class_='admin')} <%def name="admin_menu_simple()">
      -
    • ${h.link_to(_('repositories groups'),h.url('repos_groups'),class_='repos_groups')}
      • +
    • ${h.link_to(_('repository groups'),h.url('repos_groups'),class_='repos_groups')}
    ## ADMIN MENU diff --git a/rhodecode/tests/functional/test_repos_groups.py b/rhodecode/tests/functional/test_repos_groups.py --- a/rhodecode/tests/functional/test_repos_groups.py +++ b/rhodecode/tests/functional/test_repos_groups.py @@ -6,7 +6,7 @@ class TestReposGroupsController(TestCont def test_index(self): self.log_user() response = self.app.get(url('repos_groups')) - response.mustcontain('There are no repositories groups yet') + response.mustcontain('There are no repository groups yet') # def test_index_as_xml(self): # response = self.app.get(url('formatted_repos_groups', format='xml'))