Mercurial > kallithea
changeset 8552:d79de6c61359
permissions: drop traces of hg.repogroup.* permissions - it is not used and not fully implemented so don't leave it half baked
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Sun, 12 Apr 2020 01:35:05 +0200 |
parents | 1b598ea781b2 |
children | c19e720cbb21 |
files | kallithea/controllers/admin/permissions.py kallithea/model/db.py kallithea/model/forms.py kallithea/model/permission.py |
diffstat | 4 files changed, 0 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/admin/permissions.py Sat Apr 11 18:48:48 2020 +0200 +++ b/kallithea/controllers/admin/permissions.py Sun Apr 12 01:35:05 2020 +0200 @@ -97,9 +97,6 @@ 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 @@ 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
--- a/kallithea/model/db.py Sat Apr 11 18:48:48 2020 +0200 +++ b/kallithea/model/db.py Sun Apr 12 01:35:05 2020 +0200 @@ -1556,9 +1556,6 @@ ('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 @@ '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,
--- a/kallithea/model/forms.py Sat Apr 11 18:48:48 2020 +0200 +++ b/kallithea/model/forms.py Sun Apr 12 01:35:05 2020 +0200 @@ -413,7 +413,6 @@ 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)
--- a/kallithea/model/permission.py Sat Apr 11 18:48:48 2020 +0200 +++ b/kallithea/model/permission.py Sun Apr 12 01:35:05 2020 +0200 @@ -120,7 +120,6 @@ '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',