Mercurial > kallithea
diff rhodecode/controllers/login.py @ 3960:5293d4bbb1ea
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 |
line wrap: on
line diff
--- a/rhodecode/controllers/login.py Mon May 20 12:26:09 2013 +0200 +++ b/rhodecode/controllers/login.py Fri Jun 07 00:31:11 2013 +0200 @@ -126,7 +126,7 @@ @HasPermissionAnyDecorator('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate') def register(self): - c.auto_active = 'hg.register.auto_activate' in User.get_by_username('default')\ + c.auto_active = 'hg.register.auto_activate' in User.get_default_user()\ .AuthUser.permissions['global'] if request.POST: