javamickey
diff --git a/‎apps/assets/forms.py‎
Lines changed: 1 addition & 1 deletion b/‎apps/assets/forms.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎apps/common/forms.py‎
Lines changed: 5 additions & 2 deletions b/‎apps/common/forms.py‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎apps/i18n/zh/LC_MESSAGES/django.mo‎
-470 Bytes b/‎apps/i18n/zh/LC_MESSAGES/django.mo‎
-470 Bytes
@@ -127,7 +127,7 @@ class Meta:
                 attrs={'class': 'select2', 'data-placeholder': _('Select asset groups')}
             ),
             'labels': forms.SelectMultiple(
-                attrs={'class': 'select2', 'data-placeholder': _('Select lables')}
+                attrs={'class': 'select2', 'data-placeholder': _('Select labels')}
             ),
         }
 
 
@@ -117,21 +117,24 @@ class LDAPSettingForm(BaseForm):
         label=_("User OU"), initial='ou=tech,dc=jumpserver,dc=org'
     )
     AUTH_LDAP_SEARCH_FILTER = forms.CharField(
-        label=_("User search filter"), initial='(cn=%(user)s)'
+        label=_("User search filter"), initial='(cn=%(user)s)',
+        help_text=_("User search filter must contain ([cn,uid,sAMAccountName,...]=%(user)s)")
     )
     AUTH_LDAP_USER_ATTR_MAP = DictField(
         label=_("User attr map"),
         initial=json.dumps({
             "username": "cn",
             "name": "sn",
             "email": "mail"
-        })
+        }),
+        help_text=_("User attr map present how to map LDAP user attr to jumpserver, username,name,email is jumpserver attr")
     )
     # AUTH_LDAP_GROUP_SEARCH_OU = CONFIG.AUTH_LDAP_GROUP_SEARCH_OU
     # AUTH_LDAP_GROUP_SEARCH_FILTER = CONFIG.AUTH_LDAP_GROUP_SEARCH_FILTER
     AUTH_LDAP_START_TLS = forms.BooleanField(
         label=_("Use SSL"), initial=False, required=False
     )
+    AUTH_LDAP = forms.BooleanField(label=_("Enable LDAP auth"), initial=False)
 
 
 class TerminalSettingForm(BaseForm):
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ class Meta:`
`127`	`127`	`attrs={'class': 'select2', 'data-placeholder': _('Select asset groups')}`
`128`	`128`	`),`
`129`	`129`	`'labels': forms.SelectMultiple(`
`130`		`- attrs={'class': 'select2', 'data-placeholder': _('Select lables')}`
	`130`	`+ attrs={'class': 'select2', 'data-placeholder': _('Select labels')}`
`131`	`131`	`),`
`132`	`132`	`}`
`133`	`133`