kallithea Changeset - c19e720cbb21

Changeset - c19e720cbb21

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich (mads) - 6 years ago 2020-04-12 01:07:32
mads@kiilerich.com

Grafted from: 3c4578354fb7

permissions: move hg.create.repository knowledge to AvailableRepoGroupChoices - it already knows hg.admin

4 files changed with 5 insertions and 6 deletions:

kallithea/controllers/admin/repo_groups.py

kallithea/controllers/admin/repos.py

kallithea/controllers/forks.py

kallithea/model/scm.py

0 comments (0 inline, 0 general)

kallithea/controllers/admin/repo_groups.py

➞

Show inline comments

@@ @@ -63,7 +63,7 @@ class RepoGroupsController(BaseControlle @@
         exclude is used for not moving group to itself TODO: also exclude descendants
         Note: only admin can create top level groups
         """
-        repo_groups = AvailableRepoGroupChoices([], 'admin', extras)
         repo_groups = AvailableRepoGroupChoices('admin', extras)
         exclude_group_ids = set(rg.group_id for rg in exclude)
         c.repo_groups = [rg for rg in repo_groups
                          if rg[0] not in exclude_group_ids]

kallithea/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -76,14 +76,13 @@ class ReposController(BaseRepoController @@
         return repo_obj
     def __load_defaults(self, repo=None):
         top_perms = ['hg.create.repository']
         if HasPermissionAny('hg.create.write_on_repogroup.true')():
             repo_group_perm_level = 'write'
         else:
             repo_group_perm_level = 'admin'
         extras = [] if repo is None else [repo.group]
-        c.repo_groups = AvailableRepoGroupChoices(top_perms, repo_group_perm_level, extras)
         c.repo_groups = AvailableRepoGroupChoices(repo_group_perm_level, extras)
         c.landing_revs_choices, c.landing_revs = ScmModel().get_repo_landing_revs(repo)

kallithea/controllers/forks.py

➞

Show inline comments

@@ @@ -58,7 +58,7 @@ class ForksController(BaseRepoController @@
             repo_group_perm_level = 'write'
         else:
             repo_group_perm_level = 'admin'
-        c.repo_groups = AvailableRepoGroupChoices(['hg.create.repository'], repo_group_perm_level)
         c.repo_groups = AvailableRepoGroupChoices(repo_group_perm_level)
         c.landing_revs_choices, c.landing_revs = ScmModel().get_repo_landing_revs()

kallithea/model/scm.py

➞

Show inline comments

@@ @@ -748,7 +748,7 @@ class ScmModel(object): @@
                 log.debug('skipping writing hook file')
-def AvailableRepoGroupChoices(top_perms, repo_group_perm_level, extras=()):
 def AvailableRepoGroupChoices(repo_group_perm_level, extras=()):
     """Return group_id,string tuples with choices for all the repo groups where
     the user has the necessary permissions.
@@ @@ -759,7 +759,7 @@ def AvailableRepoGroupChoices(top_perms, @@
         groups.append(None)
     else:
         groups = list(RepoGroupList(groups, perm_level=repo_group_perm_level))
-        if top_perms and HasPermissionAny(*top_perms)('available repo groups'):
+        if HasPermissionAny('hg.create.repository')('available repo groups'):
             groups.append(None)
         for extra in extras:
             if not any(rg == extra for rg in groups):

0 comments (0 inline, 0 general)