diff options
author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-04-20 20:44:50 -0400 |
---|---|---|
committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-04-20 20:44:50 -0400 |
commit | ea03d66c21d7158115cf4d05490ef7c78de7cf70 (patch) | |
tree | 7076952cca68cf27b4ffd33492890b1b29ea674d /askbot/conf | |
parent | c1c4ed1535ca1b8fe603c47eb1e94ec6fe0a6baa (diff) | |
download | askbot-ea03d66c21d7158115cf4d05490ef7c78de7cf70.tar.gz askbot-ea03d66c21d7158115cf4d05490ef7c78de7cf70.tar.bz2 askbot-ea03d66c21d7158115cf4d05490ef7c78de7cf70.zip |
fixed a bug in the login page where it was impossible to remove password login fields
Diffstat (limited to 'askbot/conf')
-rw-r--r-- | askbot/conf/ldap.py | 10 | ||||
-rw-r--r-- | askbot/conf/login_providers.py | 15 |
2 files changed, 10 insertions, 15 deletions
diff --git a/askbot/conf/ldap.py b/askbot/conf/ldap.py index 34b6ec87..7d384516 100644 --- a/askbot/conf/ldap.py +++ b/askbot/conf/ldap.py @@ -10,20 +10,12 @@ LDAP_SETTINGS = livesettings.ConfigurationGroup( super_group = EXTERNAL_SERVICES ) -def enable_ldap_callback(current_value, new_value): - """enables local login form when ldap is on""" - if new_value == True: - settings.update('SIGNIN_LOCAL_ENABLED', True) - - return new_value - settings.register( livesettings.BooleanValue( LDAP_SETTINGS, 'USE_LDAP_FOR_PASSWORD_LOGIN', description=_('Use LDAP authentication for the password login'), - defaut=False, - update_callback=enable_ldap_callback + defaut=False ) ) diff --git a/askbot/conf/login_providers.py b/askbot/conf/login_providers.py index 2ee59e2a..36f71502 100644 --- a/askbot/conf/login_providers.py +++ b/askbot/conf/login_providers.py @@ -84,18 +84,21 @@ providers = ( 'LaunchPad' ) -DISABLED_BY_DEFAULT = ( - 'LaunchPad' -) +DISABLED_BY_DEFAULT = ('LaunchPad',) -need_extra_setup = ('Twitter', 'Facebook', 'LinkedIn', 'identi.ca',) +NEED_EXTRA_SETUP = ('Twitter', 'Facebook', 'LinkedIn', 'identi.ca',) for provider in providers: + if provider == 'local': + provider_string = unicode(_('local password')) + else: + provider_string = provider + kwargs = { - 'description': _('Activate %(provider)s login') % {'provider': provider}, + 'description': _('Activate %(provider)s login') % {'provider': provider_string}, 'default': not (provider in DISABLED_BY_DEFAULT) } - if provider in need_extra_setup: + if provider in NEED_EXTRA_SETUP: kwargs['help_text'] = _( 'Note: to really enable %(provider)s login ' 'some additional parameters will need to be set ' |