Mercurial > kallithea

comparison rhodecode/controllers/admin/permissions.py @ 3786:222e6769e7b5 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added separate default permission for external_auth account activation. This flag allows users to define separate option of how activation of external_accounts should be performed.
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 23 Apr 2013 00:47:22 +0200
parents a8f520540ab0
children 5293d4bbb1ea
comparison
equal deleted inserted replaced
3785:7d8154837174 3786:222e6769e7b5
73 ('hg.register.manual_activate', 73 ('hg.register.manual_activate',
74 _('Allowed with manual account activation')), 74 _('Allowed with manual account activation')),
75 ('hg.register.auto_activate', 75 ('hg.register.auto_activate',
76 _('Allowed with automatic account activation')), ] 76 _('Allowed with automatic account activation')), ]
77 77
78 c.extern_activate_choices = [
79 ('hg.extern_activate.manual', _('Manual activation of external account')),
80 ('hg.extern_activate.auto', _('Automatic activation of external account')),
81 ]
82
78 c.repo_create_choices = [('hg.create.none', _('Disabled')), 83 c.repo_create_choices = [('hg.create.none', _('Disabled')),
79 ('hg.create.repository', _('Enabled'))] 84 ('hg.create.repository', _('Enabled'))]
80 85
81 c.user_group_create_choices = [('hg.usergroup.create.false', _('Disabled')), 86 c.user_group_create_choices = [('hg.usergroup.create.false', _('Disabled')),
82 ('hg.usergroup.create.true', _('Enabled'))] 87 ('hg.usergroup.create.true', _('Enabled'))]
119 [x[0] for x in c.user_group_perms_choices], 124 [x[0] for x in c.user_group_perms_choices],
120 [x[0] for x in c.repo_create_choices], 125 [x[0] for x in c.repo_create_choices],
121 [x[0] for x in c.repo_group_create_choices], 126 [x[0] for x in c.repo_group_create_choices],
122 [x[0] for x in c.user_group_create_choices], 127 [x[0] for x in c.user_group_create_choices],
123 [x[0] for x in c.fork_choices], 128 [x[0] for x in c.fork_choices],
124 [x[0] for x in c.register_choices])() 129 [x[0] for x in c.register_choices],
130 [x[0] for x in c.extern_activate_choices],
131 )()
125 132
126 try: 133 try:
127 form_result = _form.to_python(dict(request.POST)) 134 form_result = _form.to_python(dict(request.POST))
128 form_result.update({'perm_user_name': id}) 135 form_result.update({'perm_user_name': id})
129 PermissionModel().update(form_result) 136 PermissionModel().update(form_result)
192 defaults['default_user_group_create'] = p.permission.permission_name 199 defaults['default_user_group_create'] = p.permission.permission_name
193 200
194 if p.permission.permission_name.startswith('hg.register.'): 201 if p.permission.permission_name.startswith('hg.register.'):
195 defaults['default_register'] = p.permission.permission_name 202 defaults['default_register'] = p.permission.permission_name
196 203
204 if p.permission.permission_name.startswith('hg.extern_activate.'):
205 defaults['default_extern_activate'] = p.permission.permission_name
206
197 if p.permission.permission_name.startswith('hg.fork.'): 207 if p.permission.permission_name.startswith('hg.fork.'):
198 defaults['default_fork'] = p.permission.permission_name 208 defaults['default_fork'] = p.permission.permission_name
199 209
200 return htmlfill.render( 210 return htmlfill.render(
201 render('admin/permissions/permissions.html'), 211 render('admin/permissions/permissions.html'),