engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

permissions: show user group count in permissions summary, and unified some text labels.

Browse source
This commit is contained in:
Marcin Kuzminski 2019-01-14 20:19:59 +01:00
parent 767c0da28a
commit 0a7d8bb9ea
7 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rhodecode/model/repo.py
View file

@ -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

2
rhodecode/templates/admin/repo_groups/repo_group_add.mako
View file

@ -70,7 +70,7 @@
</div>
<div class="checkboxes">
${h.checkbox('group_copy_permissions', value="True", checked="checked")}
<span class="help-block">${_('Copy permission settings from parent repository group.')}</span>
<span class="help-block">${_('Copy permissions from parent repository group.')}</span>
</div>
</div>

3
rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako
View file

@ -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):
<tr id="id${id(_user_group.users_group_name)}">
<td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'group.none', checked=_user_group.permission=='group.none')}</td>
<td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'group.read', checked=_user_group.permission=='group.read')}</td>
@ -148,6 +148,7 @@
%else:
${h.link_to_group(_user_group.users_group_name)}
%endif
(${_('members')}: ${len(_user_group.members)})
</td>
<td class="td-action">
<span class="btn btn-link btn-danger revoke_perm"

2
rhodecode/templates/admin/repos/repo_add_base.mako
View file

@ -90,7 +90,7 @@ ${h.secure_form(h.route_path('repo_create'), request=request)}
</div>
<div class="checkboxes">
${h.checkbox('repo_copy_permissions', value="True", checked="checked")}
<span class="help-block">${_('Copy permission set from the parent repository group.')}</span>
<span class="help-block">${_('Copy permissions from parent repository group.')}</span>
</div>
</div>
<div class="field">

3
rhodecode/templates/admin/repos/repo_edit_permissions.mako
View file

@ -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):
<tr>
<td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.none', checked=_user_group.permission=='repository.none')}</td>
<td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.read', checked=_user_group.permission=='repository.read')}</td>
@ -143,6 +143,7 @@
%else:
${h.link_to_group(_user_group.users_group_name)}
%endif
(${_('members')}: ${len(_user_group.members)})
</td>
<td class="td-action">
<span class="btn btn-link btn-danger revoke_perm"

3
rhodecode/templates/admin/user_groups/user_group_edit_perms.mako
View file

@ -135,7 +135,7 @@
%endfor
## USER GROUPS
%for _user_group in c.user_group.permission_user_groups():
%for _user_group in c.user_group.permission_user_groups(with_members=True):
<tr>
<td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'usergroup.none')}</td>
<td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'usergroup.read')}</td>
@ -150,6 +150,7 @@
%else:
${h.link_to_group(_user_group.users_group_name)}
%endif
(${_('members')}: ${len(_user_group.members)})
</td>
<td class="td-action">
<span class="btn btn-link btn-danger revoke_perm"

2
rhodecode/templates/forks/fork.mako
View file

@ -86,7 +86,7 @@
</div>
<div class="checkboxes">
${h.checkbox('copy_permissions',value="True", checked="checked")}
<span class="help-block">${_('Copy permissions from forked repository')}</span>
<span class="help-block">${_('Copy permissions from parent repository.')}</span>
</div>
</div>