From 7874a1539c1a5db2a5a456186268330e49b66159 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 14 Mar 2018 19:33:48 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=85=88=E4=BB=8E=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/common/forms.py | 2 +- apps/common/models.py | 2 +- apps/i18n/zh/LC_MESSAGES/django.mo | Bin 29717 -> 29683 bytes apps/i18n/zh/LC_MESSAGES/django.po | 7 +++---- apps/jumpserver/settings.py | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/apps/common/forms.py b/apps/common/forms.py index 8a6c87fe4..02af6e47a 100644 --- a/apps/common/forms.py +++ b/apps/common/forms.py @@ -118,7 +118,7 @@ class LDAPSettingForm(BaseForm): ) AUTH_LDAP_SEARCH_FILTER = forms.CharField( label=_("User search filter"), initial='(cn=%(user)s)', - help_text=_("User search filter must contain ([cn,uid,sAMAccountName,...]=%(user)s)") + help_text=_("Choice may be (cn|uid|sAMAccountName)=%(user)s)") ) AUTH_LDAP_USER_ATTR_MAP = DictField( label=_("User attr map"), diff --git a/apps/common/models.py b/apps/common/models.py index 1f634bce2..93675404f 100644 --- a/apps/common/models.py +++ b/apps/common/models.py @@ -67,7 +67,7 @@ class Setting(models.Model): if self.name == "AUTH_LDAP": if self.cleaned_value and settings.AUTH_LDAP_BACKEND not in settings.AUTHENTICATION_BACKENDS: - settings.AUTHENTICATION_BACKENDS.insert(0, settings.AUTH_LDAP_BACKEND) + settings.AUTHENTICATION_BACKENDS.append(settings.AUTH_LDAP_BACKEND) elif not self.cleaned_value and settings.AUTH_LDAP_BACKEND in settings.AUTHENTICATION_BACKENDS: settings.AUTHENTICATION_BACKENDS.remove(settings.AUTH_LDAP_BACKEND) diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo index a3449ac8e8fd080bc2bb03ab6fd29c78cf183d61..161c337a8ecd1c8cec04b2a990b68511f9a31af9 100644 GIT binary patch delta 9762 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 delta 9789 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 OS?m7C@ye!O$o3yJfm@9L diff --git a/apps/i18n/zh/LC_MESSAGES/django.po b/apps/i18n/zh/LC_MESSAGES/django.po index a6eb2e71b..fe6da5ca0 100644 --- a/apps/i18n/zh/LC_MESSAGES/django.po +++ b/apps/i18n/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Jumpserver 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-14 18:11+0800\n" +"POT-Creation-Date: 2018-03-14 19:07+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -1175,9 +1175,8 @@ msgid "User search filter" msgstr "用户过滤器" #: common/forms.py:121 -#, python-format -msgid "User search filter must contain ([cn,uid,sAMAccountName,...]=%(user)s)" -msgstr "用户过滤器必须包含([cn,uid,sAMAccountName,...]=%(user)s)" +msgid "Choice may be (cn|uid|sAMAccountName)=%(user)s)" +msgstr "可能的选项是(cn或uid或sAMAccountName=%(user)s)" #: common/forms.py:124 msgid "User attr map" diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py index 6fa15e1df..0cc200f7d 100644 --- a/apps/jumpserver/settings.py +++ b/apps/jumpserver/settings.py @@ -332,7 +332,7 @@ AUTH_LDAP_ALWAYS_UPDATE_USER = True AUTH_LDAP_BACKEND = 'django_auth_ldap.backend.LDAPBackend' if AUTH_LDAP: - AUTHENTICATION_BACKENDS.insert(0, AUTH_LDAP_BACKEND) + AUTHENTICATION_BACKENDS.append(AUTH_LDAP_BACKEND) # Celery using redis as broker CELERY_BROKER_URL = 'redis://:%(password)s@%(host)s:%(port)s/3' % {