Mercurial > kallithea

changeset 748:88338675a0f7 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed ldap issue and small template fix
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 24 Nov 2010 03:31:33 +0100
parents 2f89beda06a1
children fcd4fb51526e
files rhodecode/lib/auth.py rhodecode/public/css/style.css
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/lib/auth.py	Tue Nov 23 23:49:12 2010 +0100
+++ b/rhodecode/lib/auth.py	Wed Nov 24 03:31:33 2010 +0100
@@ -109,9 +109,9 @@
         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 @@
         # 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', ''),
--- a/rhodecode/public/css/style.css	Tue Nov 23 23:49:12 2010 +0100
+++ b/rhodecode/public/css/style.css	Wed Nov 24 03:31:33 2010 +0100
@@ -2317,7 +2317,7 @@
 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 {