From 9812f0cbda609f8d94c23a9c51b2239917344ede Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Tue, 10 Jul 2018 22:39:57 +0200 Subject: [PATCH] api: fixed recursive permissions changes to repo group. - fixes #5489 --- .../tests/test_grant_user_group_permission_to_repo_group.py | 2 ++ rhodecode/api/views/repo_group_api.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rhodecode/api/tests/test_grant_user_group_permission_to_repo_group.py b/rhodecode/api/tests/test_grant_user_group_permission_to_repo_group.py index 2798d33b..051f923d 100644 --- a/rhodecode/api/tests/test_grant_user_group_permission_to_repo_group.py +++ b/rhodecode/api/tests/test_grant_user_group_permission_to_repo_group.py @@ -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', diff --git a/rhodecode/api/views/repo_group_api.py b/rhodecode/api/views/repo_group_api.py index 6e5b4576..cb8bdb8a 100644 --- a/rhodecode/api/views/repo_group_api.py +++ b/rhodecode/api/views/repo_group_api.py @@ -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,