kallithea Changeset - dd0ee9119aa9

Changeset - dd0ee9119aa9

Parent rev.

Child rev.

[Not reviewed]

beta

0 5 0

Marcin Kuzminski - 13 years ago 2013-01-25 00:30:25
marcin@python-works.com

recursive mode of setting permission should skip private repositories, they should remain private, it's proper thing to do !

5 files changed with 16 insertions and 9 deletions:

rhodecode/model/repos_group.py

rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html

rhodecode/tests/models/common.py

rhodecode/tests/models/test_user_permissions_on_groups.py

rhodecode/tests/models/test_users_group_permissions_on_groups.py

0 comments (0 inline, 0 general)

rhodecode/model/repos_group.py

➞

Show inline comments

@@ @@ -172,12 +172,16 @@ class ReposGroupModel(BaseModel): @@
         def _set_perm_user(obj, user, perm):
             if isinstance(obj, RepoGroup):
                 ReposGroupModel().grant_user_permission(
                     repos_group=obj, user=user, perm=perm
+                )
             elif isinstance(obj, Repository):
                 #we do this ONLY IF repository is non-private
                 if obj.private:
                     return
                 # we set group permission but we have to switch to repo
                 # permission
                 perm = perm.replace('group.', 'repository.')
                 RepoModel().grant_user_permission(
                     repo=obj, user=user, perm=perm
+                )
@@ @@ -196,12 +200,13 @@ class ReposGroupModel(BaseModel): @@
+                )
         updates = []
         log.debug('Now updating permissions for %s in recursive mode:%s'
                   % (repos_group, recursive))
         for obj in repos_group.recursive_groups_and_repos():
             #obj is an instance of a group or repositories in that group
             if not recursive:
                 obj = repos_group
             # update permissions
             for member, perm, member_type in perms_updates:
                 ## set for user

rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html

➞

Show inline comments

@@ @@ -68,13 +68,13 @@ @@
             </span>
         </td>
     </tr>
     <tr>
         <td colspan="6">
            ${h.checkbox('recursive',value="True", label=_('apply to children'))}
            <span class="help-block">${_('Set or revoke permission to all children of that group, including repositories and other groups')}</span>
+           <span class="help-block">${_('Set or revoke permission to all children of that group, including non-private repositories and other groups')}</span>
         </td>
     </tr>
 </table>
 <script type="text/javascript">
 function ajaxActionUser(user_id, field_id) {
     var sUrl = "${h.url('delete_repos_group_user_perm',group_name=c.repos_group.group_name)}";

rhodecode/tests/models/common.py

➞

Show inline comments

@@ @@ -22,16 +22,17 @@ def _make_group(path, desc='desc', paren @@
     if isinstance(parent_id, RepoGroup):
         parent_id = parent_id.group_id
     gr = ReposGroupModel().create(path, desc, parent_id)
     return gr
 def _make_repo(name, repos_group=None, repo_type='hg'):
+def _make_repo(name, repos_group=None, repo_type='hg', private=False):
     return RepoModel().create_repo(name, repo_type, 'desc',
                                    TEST_USER_ADMIN_LOGIN,
                                    repos_group=repos_group)
                                    repos_group=repos_group,
                                    private=private)
 def _destroy_project_tree(test_u1_id):
     Session.remove()
     repos_group = RepoGroup.get_by_group_name(group_name='g0')
     for el in reversed(repos_group.recursive_groups_and_repos()):
@@ @@ -64,12 +65,13 @@ def _create_project_tree(): @@
      |  |__<g0/g0_2/g0_2_r1>
      |  |__<g0/g0_2/g0_2_r2>
+     |
      |__[g0_3] 1 repo
+        |
         |_<g0/g0_3/g0_3_r1>
         |_<g0/g0_3/g0_3_r2_private>
     """
     test_u1 = UserModel().create_or_update(
         username=u'test_u1', password=u'qweqwe',
         email=u'test_u1@rhodecode.org', firstname=u'test_u1', lastname=u'test_u1'
+    )
@@ @@ -81,12 +83,14 @@ def _create_project_tree(): @@
     g0_1_r1 = _make_repo('g0/g0_1/g0_1_r1', repos_group=g0_1)
     g0_2 = _make_group('g0_2', parent_id=g0)
     g0_2_r1 = _make_repo('g0/g0_2/g0_2_r1', repos_group=g0_2)
     g0_2_r2 = _make_repo('g0/g0_2/g0_2_r2', repos_group=g0_2)
     g0_3 = _make_group('g0_3', parent_id=g0)
     g0_3_r1 = _make_repo('g0/g0_3/g0_3_r1', repos_group=g0_3)
     g0_3_r2_private = _make_repo('g0/g0_3/g0_3_r1_private', repos_group=g0_3,
                                  private=True)
     return test_u1
 def expected_count(group_name, objects=False):
     repos_group = RepoGroup.get_by_group_name(group_name=group_name)
     objs = repos_group.recursive_groups_and_repos()

rhodecode/tests/models/test_user_permissions_on_groups.py

➞

Show inline comments

@@ @@ -98,13 +98,16 @@ def test_user_permissions_on_group_with_ @@
     repo_items = [x for x in _get_repo_perms(group, recursive)]
     items = [x for x in _get_group_perms(group, recursive)]
     _check_expected_count(items, repo_items, expected_count(group, True))
     for name, perm in repo_items:
         yield check_tree_perms, name, perm, group, 'repository.write'
         if name == 'g0/g0_3/g0_3_r1_private':
             yield check_tree_perms, name, perm, group, 'repository.none'
         else:
             yield check_tree_perms, name, perm, group, 'repository.write'
     for name, perm in items:
         yield check_tree_perms, name, perm, group, 'group.write'
 @with_setup(permissions_setup_func)

rhodecode/tests/models/test_users_group_permissions_on_groups.py

➞

Show inline comments

@@ @@ -114,17 +114,12 @@ def test_user_permissions_on_group_with_ @@
     for name, perm in items:
         yield check_tree_perms, name, perm, group, 'group.write'
 @with_setup(permissions_setup_func)
 def test_user_permissions_on_group_with_recursive_mode_and_private_repos():
     assert 0
 @with_setup(permissions_setup_func)
 def test_user_permissions_on_group_with_recursive_mode_inner_group():
     ## set permission to g0_3 group to none
     recursive = True
     group = 'g0/g0_3'
     permissions_setup_func(group, 'group.none', recursive=recursive)

0 comments (0 inline, 0 general)