Changeset - d79de6c61359
[Not reviewed]
default
0 4 0
Mads Kiilerich (mads) - 6 years ago 2020-04-12 01:35:05
mads@kiilerich.com
Grafted from: 8d490d960d54
permissions: drop traces of hg.repogroup.* permissions - it is not used and not fully implemented so don't leave it half baked
4 files changed with 0 insertions and 14 deletions:
0 comments (0 inline, 0 general)
kallithea/controllers/admin/permissions.py
Show inline comments
 
@@ -97,9 +97,6 @@ class PermissionsController(BaseControll
 
        c.user_group_create_choices = [('hg.usergroup.create.false', _('Disabled')),
 
                                       ('hg.usergroup.create.true', _('Enabled'))]
 

	
 
        c.repo_group_create_choices = [('hg.repogroup.create.false', _('Disabled')),
 
                                       ('hg.repogroup.create.true', _('Enabled'))]
 

	
 
        c.fork_choices = [('hg.fork.none', _('Disabled')),
 
                          ('hg.fork.repository', _('Enabled'))]
 

	
 
@@ -163,9 +160,6 @@ class PermissionsController(BaseControll
 
            elif p.permission.permission_name.startswith('hg.create.'):
 
                defaults['default_repo_create'] = p.permission.permission_name
 

	
 
            if p.permission.permission_name.startswith('hg.repogroup.'):
 
                defaults['default_repo_group_create'] = p.permission.permission_name
 

	
 
            if p.permission.permission_name.startswith('hg.usergroup.'):
 
                defaults['default_user_group_create'] = p.permission.permission_name
 

	
kallithea/model/db.py
Show inline comments
 
@@ -1556,9 +1556,6 @@ class Permission(Base, BaseDbModel):
 
        ('usergroup.write', _('Default user has write access to new user groups')),
 
        ('usergroup.admin', _('Default user has admin access to new user groups')),
 

	
 
        ('hg.repogroup.create.false', _('Only admins can create repository groups')),
 
        ('hg.repogroup.create.true', _('Non-admins can create repository groups')),
 

	
 
        ('hg.usergroup.create.false', _('Only admins can create user groups')),
 
        ('hg.usergroup.create.true', _('Non-admins can create user groups')),
 

	
 
@@ -1610,9 +1607,6 @@ class Permission(Base, BaseDbModel):
 
        'usergroup.write': 3,
 
        'usergroup.admin': 4,
 

	
 
        'hg.repogroup.create.false': 0,
 
        'hg.repogroup.create.true': 1,
 

	
 
        'hg.usergroup.create.false': 0,
 
        'hg.usergroup.create.true': 1,
 

	
kallithea/model/forms.py
Show inline comments
 
@@ -413,7 +413,6 @@ def DefaultPermissionsForm(repo_perms_ch
 
        default_repo_create = v.OneOf(create_choices)
 
        create_on_write = v.OneOf(create_on_write_choices)
 
        default_user_group_create = v.OneOf(user_group_create_choices)
 
        #default_repo_group_create = v.OneOf(repo_group_create_choices) #not impl. yet
 
        default_fork = v.OneOf(fork_choices)
 

	
 
        default_register = v.OneOf(register_choices)
kallithea/model/permission.py
Show inline comments
 
@@ -120,7 +120,6 @@ class PermissionModel(object):
 
                                 'default_user_group_perm',
 
                                 'default_repo_create',
 
                                 'create_on_write', # special case for create repos on write access to group
 
                                 #'default_repo_group_create', # not implemented yet
 
                                 'default_user_group_create',
 
                                 'default_fork',
 
                                 'default_register',
0 comments (0 inline, 0 general)