modify LDAP user name default ''

lib/locales/en-US/translation.json

@@ -231,11 +231,11 @@
       "create/edit": "Create/Edit Template page..",
       "select": "Select template page type"
     },
-    "children": {
+    "local": {
       "label": "Template for children",
       "desc": "Applies only to the same level pages which the template exists"
     },
-    "decendants": {
+    "global": {
       "label": "Template for descendants",
       "desc": "Applies to all decendant pages"
     }
@@ -351,7 +351,8 @@
       "search_filter_detail3": "If empty, the filter <code>(uid=&#123;&#123;username&#125;&#125;)</code> is used.",
       "search_filter_example1": "Match with 'uid' or 'mail'",
       "search_filter_example2": "Match with 'sAMAccountName' for Active Directory",
-      "username_detail": "Specification of mappings when creating new users",
+      "username_detail": "Specification of mappings when creating new users (username)",
+      "name_detail": "Specification of mappings when creating new users (name)'",
       "Treat username matching as identical": "Automatically bind external accounts newly logged in to local accounts when <code>username</code> match",
   		"Treat username matching as identical_warn": "WARNING: Be aware of security because the system treats the same user as a match of <code>username</code>.",
       "group_search_base_DN": "Group Search Base DN",

lib/locales/ja/translation.json

@@ -250,7 +250,7 @@
       "label": "同一階層テンプレート",
       "desc": "テンプレートページが存在する階層にのみ適応されます"
     },
-    "global": {
+    "decendants": {
       "label": "下位層テンプレート",
       "desc": "テンプレートページが存在する下位層のすべてのページに適応されます"
     }
@@ -368,8 +368,8 @@
       "search_filter_detail3": "空欄の場合 <code>(uid=&#123;&#123;username&#125;&#125;)</code> が使用されます。",
       "search_filter_example1": "'uid' または 'mail' に一致",
       "search_filter_example2": "'sAMAccountName' に一致 (Active Directory)",
-      "username_detail": "新規ユーザーに関連付けるusernameを設定",
-      "name_detail": "新規ユーザーに名前関連付ける表示名を設定",
+      "username_detail": "新規ユーザーのアカウント名usernameに関連付け",
+      "name_detail": "新規ユーザーの表示名nameに関連付け",
       "Treat username matching as identical": "新規ログイン時、<code>username</code> が一致したローカルアカウントが存在した場合は自動的に紐付ける",
       "Treat username matching as identical_warn": "WARNING: <code>username</code> の一致を以て同一ユーザーであるとみなすので、セキュリティに注意してください",
       "group_search_base_DN": "グループ検索ベース DN",

lib/service/passport.js

@@ -145,7 +145,7 @@ class PassportService {
    */
   getLdapAttrNameMappedToName() {
     const config = this.crowi.config;
-    return config.crowi['security:passport-ldap:attrMapName'] || 'sAMAccountName';
+    return config.crowi['security:passport-ldap:attrMapName'] || '';
   }
 
   /**

lib/views/admin/widget/passport/ldap.html

@@ -136,7 +136,7 @@
         <div class="row">
         <label for="settingForm[security:passport-ldap:attrMapName]" class="col-xs-3 control-label">name</label>
         <div class="col-xs-6">
-          <input class="form-control" type="text" placeholder="Default: sAMAccountName"
+          <input class="form-control" type="text" placeholder="Default: null"
               name="settingForm[security:passport-ldap:attrMapName]" value="{{ settingForm['security:passport-ldap:attrMapName'] || '' }}">
           <p class="help-block">
             <small>