Changeset - 88338675a0f7
[Not reviewed]
beta
0 2 0
Marcin Kuzminski - 15 years ago 2010-11-24 03:31:33
marcin@python-works.com
fixed ldap issue and small template fix
2 files changed with 5 insertions and 5 deletions:
0 comments (0 inline, 0 general)
rhodecode/lib/auth.py
Show inline comments
 
@@ -109,9 +109,9 @@ def authfunc(environ, username, password
 
        username = username.lower()
 
        user_obj = user_model.get_by_username(username, cache=False,
 
                                            case_insensitive=True)
 
        if user_obj is not None:
 
            return False 
 
        
 
        if user_obj is not None and user_obj.is_ldap is False:
 
            return False
 

	
 
        from rhodecode.model.settings import SettingsModel
 
        ldap_settings = SettingsModel().get_ldap_settings()
 

	
 
@@ -119,7 +119,7 @@ def authfunc(environ, username, password
 
        # FALLBACK TO LDAP AUTH IN ENABLE                
 
        #======================================================================
 
        if ldap_settings.get('ldap_active', False):
 
            
 

	
 
            kwargs = {
 
                  'server':ldap_settings.get('ldap_host', ''),
 
                  'base_dn':ldap_settings.get('ldap_base_dn', ''),
rhodecode/public/css/style.css
Show inline comments
 
@@ -2317,7 +2317,7 @@ display:block;
 
color:red;
 
margin:8px 0 0;
 
padding:0;
 
width: 320px;
 
max-width: 320px;
 
}
 
 
#login div.form div.fields div.field div.label label,#register div.form div.fields div.field div.label label {
0 comments (0 inline, 0 general)