diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py
--- a/rhodecode/model/repo.py
+++ b/rhodecode/model/repo.py
@@ -462,8 +462,7 @@ class RepoModel(BaseModel):
UserGroupRepoToPerm.create(
perm.users_group, new_repo, perm.permission)
# in case we copy permissions and also set this repo to private
- # override the default user permission to make it a private
- # repo
+ # override the default user permission to make it a private repo
if private:
RepoModel(self.sa).grant_user_permission(
repo=new_repo, user=User.DEFAULT_USER, perm=EMPTY_PERM)
@@ -485,8 +484,7 @@ class RepoModel(BaseModel):
perm_name = perm.permission.permission_name.replace(
'group.', 'repository.')
perm_obj = Permission.get_by_key(perm_name)
- UserGroupRepoToPerm.create(
- perm.users_group, new_repo, perm_obj)
+ UserGroupRepoToPerm.create(perm.users_group, new_repo, perm_obj)
if private:
RepoModel(self.sa).grant_user_permission(
@@ -497,8 +495,7 @@ class RepoModel(BaseModel):
self.sa.add(perm_obj)
# now automatically start following this repository as owner
- ScmModel(self.sa).toggle_following_repo(new_repo.repo_id,
- owner.user_id)
+ ScmModel(self.sa).toggle_following_repo(new_repo.repo_id, owner.user_id)
# we need to flush here, in order to check if database won't
# throw any exceptions, create filesystem dirs at the very end
diff --git a/rhodecode/templates/admin/repo_groups/repo_group_add.mako b/rhodecode/templates/admin/repo_groups/repo_group_add.mako
--- a/rhodecode/templates/admin/repo_groups/repo_group_add.mako
+++ b/rhodecode/templates/admin/repo_groups/repo_group_add.mako
@@ -70,7 +70,7 @@
${h.checkbox('group_copy_permissions', value="True", checked="checked")}
- ${_('Copy permission settings from parent repository group.')}
+ ${_('Copy permissions from parent repository group.')}
diff --git a/rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako b/rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako
--- a/rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako
+++ b/rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako
@@ -133,7 +133,7 @@
%endfor
## USER GROUPS
- %for _user_group in c.repo_group.permission_user_groups():
+ %for _user_group in c.repo_group.permission_user_groups(with_members=True):
${h.radio('g_perm_%s' % _user_group.users_group_id,'group.none', checked=_user_group.permission=='group.none')} |
${h.radio('g_perm_%s' % _user_group.users_group_id,'group.read', checked=_user_group.permission=='group.read')} |
@@ -148,6 +148,7 @@
%else:
${h.link_to_group(_user_group.users_group_name)}
%endif
+ (${_('members')}: ${len(_user_group.members)})
${h.checkbox('repo_copy_permissions', value="True", checked="checked")}
- ${_('Copy permission set from the parent repository group.')}
+ ${_('Copy permissions from parent repository group.')}
diff --git a/rhodecode/templates/admin/repos/repo_edit_permissions.mako b/rhodecode/templates/admin/repos/repo_edit_permissions.mako
--- a/rhodecode/templates/admin/repos/repo_edit_permissions.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_permissions.mako
@@ -128,7 +128,7 @@
%endfor
## USER GROUPS
- %for _user_group in c.rhodecode_db_repo.permission_user_groups():
+ %for _user_group in c.rhodecode_db_repo.permission_user_groups(with_members=True):
${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.none', checked=_user_group.permission=='repository.none')} |
${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.read', checked=_user_group.permission=='repository.read')} |
@@ -143,6 +143,7 @@
%else:
${h.link_to_group(_user_group.users_group_name)}
%endif
+ (${_('members')}: ${len(_user_group.members)})
| ${h.radio('g_perm_%s' % _user_group.users_group_id,'usergroup.none')} |
${h.radio('g_perm_%s' % _user_group.users_group_id,'usergroup.read')} |
@@ -150,6 +150,7 @@
%else:
${h.link_to_group(_user_group.users_group_name)}
%endif
+ (${_('members')}: ${len(_user_group.members)})
${h.checkbox('copy_permissions',value="True", checked="checked")}
- ${_('Copy permissions from forked repository')}
+ ${_('Copy permissions from parent repository.')}
| |