diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-07-17 22:58:21 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-07-17 22:58:21 -0400 |
| commit | 3e8ef1484536073f5f570c5ca28edc14be3deee7 (patch) | |
| tree | 3e683b906604b825eb84e6102ebb9e5af784db7a | |
| parent | 16a4b317650ced5c66b1268814524ed6fedb6524 (diff) | |
| download | askbot-3e8ef1484536073f5f570c5ca28edc14be3deee7.tar.gz askbot-3e8ef1484536073f5f570c5ca28edc14be3deee7.tar.bz2 askbot-3e8ef1484536073f5f570c5ca28edc14be3deee7.zip | |
added AUTOFILL_USER_DATA option
| -rw-r--r-- | askbot/conf/user_settings.py | 10 | ||||
| -rw-r--r-- | askbot/deps/django_authopenid/views.py | 11 |
2 files changed, 16 insertions, 5 deletions
diff --git a/askbot/conf/user_settings.py b/askbot/conf/user_settings.py index e7dea7c8..cfd32e7b 100644 --- a/askbot/conf/user_settings.py +++ b/askbot/conf/user_settings.py @@ -34,6 +34,16 @@ settings.register( ) settings.register( + livesettings.StringValue( + USER_SETTINGS, + 'AUTOFILL_USER_DATA', + default = True, + description = _('Auto-fill user name, email, etc on registration'), + help_text = _('... when users register via external services') + ) +) + +settings.register( livesettings.BooleanValue( USER_SETTINGS, 'EDITABLE_EMAIL', diff --git a/askbot/deps/django_authopenid/views.py b/askbot/deps/django_authopenid/views.py index c19f5a85..e10e6626 100644 --- a/askbot/deps/django_authopenid/views.py +++ b/askbot/deps/django_authopenid/views.py @@ -338,12 +338,13 @@ def signin(request): else: #continue with proper registration ldap_username = user_info['ldap_username'] - request.session['username'] = ldap_username request.session['email'] = user_info['email'] - request.session['first_name'] = \ - user_info['first_name'] - request.session['last_name'] = \ - user_info['last_name'] + if askbot_settings.AUTOFILL_USER_DATA: + request.session['username'] = ldap_username + request.session['first_name'] = \ + user_info['first_name'] + request.session['last_name'] = \ + user_info['last_name'] return finalize_generic_signin( request, login_provider_name = 'ldap', |