##// END OF EJS Templates
fixed ldap issue and small template fix
marcink -
r748:88338675 beta
parent child Browse files
Show More
@@ -109,9 +109,9 b' def authfunc(environ, username, password'
109 username = username.lower()
109 username = username.lower()
110 user_obj = user_model.get_by_username(username, cache=False,
110 user_obj = user_model.get_by_username(username, cache=False,
111 case_insensitive=True)
111 case_insensitive=True)
112 if user_obj is not None:
112 if user_obj is not None and user_obj.is_ldap is False:
113 return False
113 return False
114
114
115 from rhodecode.model.settings import SettingsModel
115 from rhodecode.model.settings import SettingsModel
116 ldap_settings = SettingsModel().get_ldap_settings()
116 ldap_settings = SettingsModel().get_ldap_settings()
117
117
@@ -119,7 +119,7 b' def authfunc(environ, username, password'
119 # FALLBACK TO LDAP AUTH IN ENABLE
119 # FALLBACK TO LDAP AUTH IN ENABLE
120 #======================================================================
120 #======================================================================
121 if ldap_settings.get('ldap_active', False):
121 if ldap_settings.get('ldap_active', False):
122
122
123 kwargs = {
123 kwargs = {
124 'server':ldap_settings.get('ldap_host', ''),
124 'server':ldap_settings.get('ldap_host', ''),
125 'base_dn':ldap_settings.get('ldap_base_dn', ''),
125 'base_dn':ldap_settings.get('ldap_base_dn', ''),
@@ -2317,7 +2317,7 b' display:block;'
2317 color:red;
2317 color:red;
2318 margin:8px 0 0;
2318 margin:8px 0 0;
2319 padding:0;
2319 padding:0;
2320 width: 320px;
2320 max-width: 320px;
2321 }
2321 }
2322
2322
2323 #login div.form div.fields div.field div.label label,#register div.form div.fields div.field div.label label {
2323 #login div.form div.fields div.field div.label label,#register div.form div.fields div.field div.label label {
General Comments 0
You need to be logged in to leave comments. Login now