Mercurial > kallithea

comparison rhodecode/controllers/login.py @ 3370:fdb0f59b2189 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes #762, LDAP and container created users are now activated based on the registration settings in permissions
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 14 Feb 2013 23:34:59 +0100
parents c5169e445fb8
children 260a7a01b054
comparison
equal deleted inserted replaced
3369:667630c98eaa 3370:fdb0f59b2189
124 return render('/login.html') 124 return render('/login.html')
125 125
126 @HasPermissionAnyDecorator('hg.admin', 'hg.register.auto_activate', 126 @HasPermissionAnyDecorator('hg.admin', 'hg.register.auto_activate',
127 'hg.register.manual_activate') 127 'hg.register.manual_activate')
128 def register(self): 128 def register(self):
129 c.auto_active = False 129 c.auto_active = 'hg.register.auto_activate' in User.get_by_username('default')\
130 for perm in User.get_by_username('default').user_perms: 130 .AuthUser.permissions['global']
131 if perm.permission.permission_name == 'hg.register.auto_activate':
132 c.auto_active = True
133 break
134 131
135 if request.POST: 132 if request.POST:
136
137 register_form = RegisterForm()() 133 register_form = RegisterForm()()
138 try: 134 try:
139 form_result = register_form.to_python(dict(request.POST)) 135 form_result = register_form.to_python(dict(request.POST))
140 form_result['active'] = c.auto_active 136 form_result['active'] = c.auto_active
141 UserModel().create_registration(form_result) 137 UserModel().create_registration(form_result)
142 h.flash(_('You have successfully registered into rhodecode'), 138 h.flash(_('You have successfully registered into RhodeCode'),
143 category='success') 139 category='success')
144 Session().commit() 140 Session().commit()
145 return redirect(url('login_home')) 141 return redirect(url('login_home'))
146 142
147 except formencode.Invalid, errors: 143 except formencode.Invalid, errors: