Mercurial > kallithea
changeset 3416:5706f6ab60cf beta
follow-up on texts missing from 'users groups'/'repositories group' cleanup
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 27 Feb 2013 17:18:41 +0100 |
| parents | b8f929bff7e3 |
| children | fa6ba6727475 |
| files | docs/changelog.rst rhodecode/config/routing.py rhodecode/model/db.py rhodecode/model/repos_group.py rhodecode/model/validators.py rhodecode/templates/admin/permissions/permissions.html rhodecode/templates/index_base.html |
| diffstat | 7 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/changelog.rst Wed Feb 27 02:27:09 2013 +0100 +++ b/docs/changelog.rst Wed Feb 27 17:18:41 2013 +0100 @@ -520,7 +520,7 @@ and groups - fixes #271 rare JSON serialization problem with statistics - fixes #337 missing validation check for conflicting names of a group with a - repositories group + repository group - #340 fixed session problem for mysql and celery tasks - fixed #331 RhodeCode mangles repository names if the a repository group contains the "full path" to the repositories
--- a/rhodecode/config/routing.py Wed Feb 27 02:27:09 2013 +0100 +++ b/rhodecode/config/routing.py Wed Feb 27 17:18:41 2013 +0100 @@ -48,7 +48,7 @@ def check_group(environ, match_dict): """ - check for valid repositories group for proper 404 handling + check for valid repository group for proper 404 handling :param environ: :param match_dict:
--- a/rhodecode/model/db.py Wed Feb 27 02:27:09 2013 +0100 +++ b/rhodecode/model/db.py Wed Feb 27 17:18:41 2013 +0100 @@ -1378,10 +1378,10 @@ ('repository.write', _('Repository write access')), ('repository.admin', _('Repository admin access')), - ('group.none', _('Repositories Group no access')), - ('group.read', _('Repositories Group read access')), - ('group.write', _('Repositories Group write access')), - ('group.admin', _('Repositories Group admin access')), + ('group.none', _('Repository group no access')), + ('group.read', _('Repository group read access')), + ('group.write', _('Repository group write access')), + ('group.admin', _('Repository group admin access')), ('hg.admin', _('RhodeCode Administrator')), ('hg.create.none', _('Repository creation disabled')),
--- a/rhodecode/model/repos_group.py Wed Feb 27 02:27:09 2013 +0100 +++ b/rhodecode/model/repos_group.py Wed Feb 27 17:18:41 2013 +0100 @@ -79,7 +79,7 @@ def __create_group(self, group_name): """ - makes repositories group on filesystem + makes repository group on filesystem :param repo_name: :param parent_id: @@ -327,7 +327,7 @@ def grant_user_permission(self, repos_group, user, perm): """ - Grant permission for user on given repositories group, or update + Grant permission for user on given repository group, or update existing one if found :param repos_group: Instance of ReposGroup, repositories_group_id, @@ -356,7 +356,7 @@ def revoke_user_permission(self, repos_group, user): """ - Revoke permission for user on given repositories group + Revoke permission for user on given repository group :param repos_group: Instance of ReposGroup, repositories_group_id, or repositories_group name @@ -376,7 +376,7 @@ def grant_users_group_permission(self, repos_group, group_name, perm): """ - Grant permission for user group on given repositories group, or update + Grant permission for user group on given repository group, or update existing one if found :param repos_group: Instance of ReposGroup, repositories_group_id, @@ -407,7 +407,7 @@ def revoke_users_group_permission(self, repos_group, group_name): """ - Revoke permission for user group on given repositories group + Revoke permission for user group on given repository group :param repos_group: Instance of ReposGroup, repositories_group_id, or repositories_group name
--- a/rhodecode/model/validators.py Wed Feb 27 02:27:09 2013 +0100 +++ b/rhodecode/model/validators.py Wed Feb 27 17:18:41 2013 +0100 @@ -133,7 +133,7 @@ class _validator(formencode.validators.FancyValidator): messages = { 'invalid_group': _(u'Invalid user group name'), - 'group_exist': _(u'Users group "%(usersgroup)s" already exists'), + 'group_exist': _(u'User group "%(usersgroup)s" already exists'), 'invalid_usersgroup_name': _(u'user group name may only contain alphanumeric ' 'characters underscores, periods or dashes and must begin ' @@ -317,7 +317,7 @@ _(u'Repository named %(repo)s already exists'), 'repository_in_group_exists': _(u'Repository "%(repo)s" already ' 'exists in group "%(group)s"'), - 'same_group_exists': _(u'Repositories group with name "%(repo)s" ' + 'same_group_exists': _(u'Repository group with name "%(repo)s" ' 'already exists') }
--- a/rhodecode/templates/admin/permissions/permissions.html Wed Feb 27 02:27:09 2013 +0100 +++ b/rhodecode/templates/admin/permissions/permissions.html Wed Feb 27 17:18:41 2013 +0100 @@ -59,7 +59,7 @@ ${h.checkbox('overwrite_default_group','true')} <label for="overwrite_default_group"> <span class="tooltip" - title="${h.tooltip(_('All default permissions on each repository group will be reset to choosen permission, note that all custom default permission on repositories group will be lost'))}"> + title="${h.tooltip(_('All default permissions on each repository group will be reset to choosen permission, note that all custom default permission on repository groups will be lost'))}"> ${_('overwrite existing settings')}</span> </label> </div>
--- a/rhodecode/templates/index_base.html Wed Feb 27 02:27:09 2013 +0100 +++ b/rhodecode/templates/index_base.html Wed Feb 27 17:18:41 2013 +0100 @@ -48,7 +48,7 @@ <tr> <td> <div style="white-space: nowrap"> - <img class="icon" alt="${_('Repositories group')}" src="${h.url('/images/icons/database_link.png')}"/> + <img class="icon" alt="${_('Repository group')}" src="${h.url('/images/icons/database_link.png')}"/> ${h.link_to(gr.name,url('repos_group_home',group_name=gr.group_name))} </div> </td>