diff options
author | Marcin Kuzminski <marcin@python-works.com> | 2013-02-14 23:34:59 +0100 |
---|---|---|
committer | Marcin Kuzminski <marcin@python-works.com> | 2013-02-14 23:34:59 +0100 |
commit | 6eeb175132f510c91f36145e8cb4fc7aa01ebfb7 (patch) | |
tree | 3c2026f2ede64aba5b809a0617369cf233fbff6a /rhodecode/controllers | |
parent | 9f2b1fd8b2e3c51212ffd709032dd51602248c42 (diff) |
fixes #762, LDAP and container created users are now activated based on
the registration settings in permissions
--HG--
extra : source : fdb0f59b21891c21c9b71d8d945d096a1f6a665d
Diffstat (limited to 'rhodecode/controllers')
-rw-r--r-- | rhodecode/controllers/login.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/rhodecode/controllers/login.py b/rhodecode/controllers/login.py index da9c07f8..583d3004 100644 --- a/rhodecode/controllers/login.py +++ b/rhodecode/controllers/login.py @@ -126,20 +126,16 @@ class LoginController(BaseController): @HasPermissionAnyDecorator('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate') def register(self): - c.auto_active = False - for perm in User.get_by_username('default').user_perms: - if perm.permission.permission_name == 'hg.register.auto_activate': - c.auto_active = True - break + c.auto_active = 'hg.register.auto_activate' in User.get_by_username('default')\ + .AuthUser.permissions['global'] if request.POST: - register_form = RegisterForm()() try: form_result = register_form.to_python(dict(request.POST)) form_result['active'] = c.auto_active UserModel().create_registration(form_result) - h.flash(_('You have successfully registered into rhodecode'), + h.flash(_('You have successfully registered into RhodeCode'), category='success') Session().commit() return redirect(url('login_home')) |