From 3886577031402860eac22b068c258805f80a5a1f Mon Sep 17 00:00:00 2001
From: Daniel Reis <dgreis@sapo.pt>
Date: Wed, 21 Aug 2013 08:57:25 +0100
Subject: [PATCH] FIX name_attribute is given an explicit default

---
 users_ldap_mail/users_ldap_model.py | 5 +++--
 users_ldap_mail/users_ldap_view.xml | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/users_ldap_mail/users_ldap_model.py b/users_ldap_mail/users_ldap_model.py
index dd447ec3b..8e31dedc9 100644
--- a/users_ldap_mail/users_ldap_model.py
+++ b/users_ldap_mail/users_ldap_model.py
@@ -28,11 +28,12 @@ class CompanyLDAP(orm.Model):
     _inherit = 'res.company.ldap'
     _columns = {
         'name_attribute': fields.char('Name Attribute', size=64,
-            help="Default in 'cn'. For an AD you could use 'displayName' instead."),
+            help="LDAP attribute for the user's name. Usually 'cn' or 'displayName'"),
         'mail_attribute': fields.char('E-mail attribute', size=64,
-            help="Active Directory uses the 'mail' attribute."),
+            help="LDAP attribute to use for e-mail addresses."),
         }
     _defaults = {
+        'name_attribute': 'cn',
         'mail_attribute': 'mail',
         }
 
diff --git a/users_ldap_mail/users_ldap_view.xml b/users_ldap_mail/users_ldap_view.xml
index 945a5651e..9395e602f 100644
--- a/users_ldap_mail/users_ldap_view.xml
+++ b/users_ldap_mail/users_ldap_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
 
                 <field name="ldap_filter" position="after">
-                    <field name="name_attribute" placeholder="e.g. displayName"/>
+                    <field name="name_attribute"/>
                     <field name="mail_attribute"/>
                 </field>