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

api: fixed recursive permissions changes to repo group.

Browse source 
- fixes #5489
This commit is contained in:
Marcin Kuzminski 2018-07-10 22:39:57 +02:00
parent 79dce74e8a
commit 9812f0cbda
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rhodecode/api/tests/test_grant_user_group_permission_to_repo_group.py
View file

@ -54,6 +54,8 @@ class TestGrantUserGroupPermissionFromRepoGroup(object):
self, name, perm, apply_to_children, user_util):
user_group = user_util.create_user_group()
repo_group = user_util.create_repo_group()
user_util.create_repo(parent=repo_group)
id_, params = build_data(
self.apikey,
'grant_user_group_permission_to_repo_group',

4
rhodecode/api/views/repo_group_api.py
View file

@ -451,7 +451,7 @@ def grant_user_permission_to_repo_group(
perm = get_perm_or_error(perm, prefix='group.')
apply_to_children = Optional.extract(apply_to_children)
perm_additions = [[user.user_id, perm, "user"]]
perm_additions = [[user.user_id, perm.permission_name, "user"]]
try:
RepoGroupModel().update_permissions(repo_group=repo_group,
perm_additions=perm_additions,
@ -609,7 +609,7 @@ def grant_user_group_permission_to_repo_group(
apply_to_children = Optional.extract(apply_to_children)
perm_additions = [[user_group.users_group_id, perm, "user_group"]]
perm_additions = [[user_group.users_group_id, perm.permission_name, "user_group"]]
try:
RepoGroupModel().update_permissions(repo_group=repo_group,
perm_additions=perm_additions,