kallithea Changeset - 88338675a0f7

Changeset - 88338675a0f7

Parent rev.

Child rev.

[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 2 insertions and 2 deletions:

rhodecode/lib/auth.py

rhodecode/public/css/style.css

0 comments (0 inline, 0 general)

rhodecode/lib/auth.py

➞

Show inline comments

@@ @@ -106,13 +106,13 @@ def authfunc(environ, username, password @@
         #since ldap is searching in case insensitive check if this user is still
         #not in our system
         username = username.lower()
         user_obj = user_model.get_by_username(username, cache=False,
                                             case_insensitive=True)
         if user_obj is not None:
+        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()
         #======================================================================

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -2314,13 +2314,13 @@ padding:0 0 10px; @@
 #login div.form div.fields div.field span.error-message,#register div.form div.fields div.field span.error-message {
 height:1%;
 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 {
 color:#000;
 font-weight:700;
+}

0 comments (0 inline, 0 general)