Mercurial > kallithea

comparison rhodecode/controllers/admin/permissions.py @ 3098:a5f0bc867edc rhodecode-0.0.1.5.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with beta
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 13 Dec 2012 22:54:21 +0100
parents 63e58ef80ef1 d3200c58764e
children cd50d1b5f35b
comparison
equal deleted inserted replaced
2909:52b1c6de19c2 3098:a5f0bc867edc
54 def __before__(self): 54 def __before__(self):
55 c.admin_user = session.get('admin_user') 55 c.admin_user = session.get('admin_user')
56 c.admin_username = session.get('admin_username') 56 c.admin_username = session.get('admin_username')
57 super(PermissionsController, self).__before__() 57 super(PermissionsController, self).__before__()
58 58
59 self.perms_choices = [('repository.none', _('None'),), 59 self.repo_perms_choices = [('repository.none', _('None'),),
60 ('repository.read', _('Read'),), 60 ('repository.read', _('Read'),),
61 ('repository.write', _('Write'),), 61 ('repository.write', _('Write'),),
62 ('repository.admin', _('Admin'),)] 62 ('repository.admin', _('Admin'),)]
63 self.group_perms_choices = [('group.none', _('None'),),
64 ('group.read', _('Read'),),
65 ('group.write', _('Write'),),
66 ('group.admin', _('Admin'),)]
63 self.register_choices = [ 67 self.register_choices = [
64 ('hg.register.none', 68 ('hg.register.none',
65 _('disabled')), 69 _('disabled')),
66 ('hg.register.manual_activate', 70 ('hg.register.manual_activate',
67 _('allowed with manual account activation')), 71 _('allowed with manual account activation')),
73 77
74 self.fork_choices = [('hg.fork.none', _('Disabled')), 78 self.fork_choices = [('hg.fork.none', _('Disabled')),
75 ('hg.fork.repository', _('Enabled'))] 79 ('hg.fork.repository', _('Enabled'))]
76 80
77 # set the global template variables 81 # set the global template variables
78 c.perms_choices = self.perms_choices 82 c.repo_perms_choices = self.repo_perms_choices
83 c.group_perms_choices = self.group_perms_choices
79 c.register_choices = self.register_choices 84 c.register_choices = self.register_choices
80 c.create_choices = self.create_choices 85 c.create_choices = self.create_choices
81 c.fork_choices = self.fork_choices 86 c.fork_choices = self.fork_choices
82 87
83 def index(self, format='html'): 88 def index(self, format='html'):
101 # method='put') 106 # method='put')
102 # url('permission', id=ID) 107 # url('permission', id=ID)
103 108
104 permission_model = PermissionModel() 109 permission_model = PermissionModel()
105 110
106 _form = DefaultPermissionsForm([x[0] for x in self.perms_choices], 111 _form = DefaultPermissionsForm([x[0] for x in self.repo_perms_choices],
112 [x[0] for x in self.group_perms_choices],
107 [x[0] for x in self.register_choices], 113 [x[0] for x in self.register_choices],
108 [x[0] for x in self.create_choices], 114 [x[0] for x in self.create_choices],
109 [x[0] for x in self.fork_choices])() 115 [x[0] for x in self.fork_choices])()
110 116
111 try: 117 try:
155 defaults = {'_method': 'put', 161 defaults = {'_method': 'put',
156 'anonymous': default_user.active} 162 'anonymous': default_user.active}
157 163
158 for p in default_user.user_perms: 164 for p in default_user.user_perms:
159 if p.permission.permission_name.startswith('repository.'): 165 if p.permission.permission_name.startswith('repository.'):
160 defaults['default_perm'] = p.permission.permission_name 166 defaults['default_repo_perm'] = p.permission.permission_name
167
168 if p.permission.permission_name.startswith('group.'):
169 defaults['default_group_perm'] = p.permission.permission_name
161 170
162 if p.permission.permission_name.startswith('hg.register.'): 171 if p.permission.permission_name.startswith('hg.register.'):
163 defaults['default_register'] = p.permission.permission_name 172 defaults['default_register'] = p.permission.permission_name
164 173
165 if p.permission.permission_name.startswith('hg.create.'): 174 if p.permission.permission_name.startswith('hg.create.'):