Mercurial > kallithea

comparison rhodecode/controllers/login.py @ 3960:5293d4bbb1ea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged dev into stable/default/master branch
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 07 Jun 2013 00:31:11 +0200
parents 3563bb7b4b82 a8f520540ab0
children 3b136af34329
comparison
equal deleted inserted replaced
3879:51596d9ef2f8 3960:5293d4bbb1ea
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 = 'hg.register.auto_activate' in User.get_by_username('default')\ 129 c.auto_active = 'hg.register.auto_activate' in User.get_default_user()\
130 .AuthUser.permissions['global'] 130 .AuthUser.permissions['global']
131 131
132 if request.POST: 132 if request.POST:
133 register_form = RegisterForm()() 133 register_form = RegisterForm()()
134 try: 134 try: