kallithea Changeset - a9565b8b429b

Changeset - a9565b8b429b

Parent rev.

Child rev.

[Not reviewed]

beta

0 5 0

Marcin Kuzminski - 13 years ago 2013-01-28 00:02:09
marcin@python-works.com

filter out repo groups choices to only ones that you have write+ access to. Before it was read+ access and you got proper
error saying that you don't have write permissions to group to create repo in. Filtering out the read groups is less confusing for users.
ref #730

5 files changed with 19 insertions and 16 deletions:

rhodecode/controllers/admin/repos.py

rhodecode/controllers/admin/settings.py

rhodecode/controllers/forks.py

rhodecode/controllers/settings.py

rhodecode/model/db.py

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -45,7 +45,7 @@ from rhodecode.model.meta import Session @@
 from rhodecode.model.db import User, Repository, UserFollowing, RepoGroup,\
     RhodeCodeSetting
 from rhodecode.model.forms import RepoForm
 from rhodecode.model.scm import ScmModel
+from rhodecode.model.scm import ScmModel, GroupList
 from rhodecode.model.repo import RepoModel
 from rhodecode.lib.compat import json
 from sqlalchemy.sql.expression import func
@@ @@ -68,7 +68,9 @@ class ReposController(BaseController): @@
         super(ReposController, self).__before__()
     def __load_defaults(self):
         c.repo_groups = RepoGroup.groups_choices(check_perms=True)
         acl_groups = GroupList(RepoGroup.query().all(),
                                perm_set=['group.write', 'group.admin'])
         c.repo_groups = RepoGroup.groups_choices(groups=acl_groups)
         c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
         repo_model = RepoModel()

rhodecode/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -46,7 +46,7 @@ from rhodecode.model.db import RhodeCode @@
     RhodeCodeSetting, PullRequest, PullRequestReviewers
 from rhodecode.model.forms import UserForm, ApplicationSettingsForm, \
     ApplicationUiSettingsForm, ApplicationVisualisationForm
 from rhodecode.model.scm import ScmModel
+from rhodecode.model.scm import ScmModel, GroupList
 from rhodecode.model.user import UserModel
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.db import User
@@ @@ -483,7 +483,9 @@ class SettingsController(BaseController) @@
     def create_repository(self):
         """GET /_admin/create_repository: Form to create a new item"""
         c.repo_groups = RepoGroup.groups_choices(check_perms=True)
         acl_groups = GroupList(RepoGroup.query().all(),
                                perm_set=['group.write', 'group.admin'])
         c.repo_groups = RepoGroup.groups_choices(groups=acl_groups)
         c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
         choices, c.landing_revs = ScmModel().get_repo_landing_revs()

rhodecode/controllers/forks.py

➞

Show inline comments

@@ @@ -41,7 +41,7 @@ from rhodecode.lib.base import BaseRepoC @@
 from rhodecode.model.db import Repository, RepoGroup, UserFollowing, User
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.forms import RepoForkForm
 from rhodecode.model.scm import ScmModel
+from rhodecode.model.scm import ScmModel, GroupList
 from rhodecode.lib.utils2 import safe_int
 log = logging.getLogger(__name__)
@@ @@ -54,7 +54,9 @@ class ForksController(BaseRepoController @@
         super(ForksController, self).__before__()
     def __load_defaults(self):
         c.repo_groups = RepoGroup.groups_choices(check_perms=True)
         acl_groups = GroupList(RepoGroup.query().all(),
                                perm_set=['group.write', 'group.admin'])
         c.repo_groups = RepoGroup.groups_choices(groups=acl_groups)
         c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
         choices, c.landing_revs = ScmModel().get_repo_landing_revs()
         c.landing_revs_choices = choices

rhodecode/controllers/settings.py

➞

Show inline comments

@@ @@ -44,7 +44,7 @@ from rhodecode.model.forms import RepoSe @@
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.db import RepoGroup, Repository
 from rhodecode.model.meta import Session
 from rhodecode.model.scm import ScmModel
+from rhodecode.model.scm import ScmModel, GroupList
 log = logging.getLogger(__name__)
@@ @@ -56,7 +56,9 @@ class SettingsController(BaseRepoControl @@
         super(SettingsController, self).__before__()
     def __load_defaults(self):
         c.repo_groups = RepoGroup.groups_choices(check_perms=True)
         acl_groups = GroupList(RepoGroup.query().all(),
                                perm_set=['group.write', 'group.admin'])
         c.repo_groups = RepoGroup.groups_choices(groups=acl_groups)
         c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
         repo_model = RepoModel()
@@ @@ -73,8 +75,7 @@ class SettingsController(BaseRepoControl @@
         """
         self.__load_defaults()
         c.repo_info = db_repo = Repository.get_by_repo_name(repo_name)
         repo = db_repo.scm_instance
         c.repo_info = Repository.get_by_repo_name(repo_name)
         if c.repo_info is None:
             h.not_mapped_error(repo_name)

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -1177,15 +1177,11 @@ class RepoGroup(Base, BaseModel): @@
                                   self.group_name)
     @classmethod
-    def groups_choices(cls, groups=None, check_perms=False, show_empty_group=True):
     def groups_choices(cls, groups=None, show_empty_group=True):
         from webhelpers.html import literal as _literal
         from rhodecode.model.scm import ScmModel
         if not groups:
             groups = cls.query().all()
         if check_perms:
             #filter group user have access to, it's done
             #magically inside ScmModel based on current user
             groups = ScmModel().get_repos_groups(groups)
         repo_groups = []
         if show_empty_group:
             repo_groups = [('-1', '-- no parent --')]

0 comments (0 inline, 0 general)