[Update] Merge branch dev to 1.5.5

This commit is contained in:
BaiJiangJie
2019-11-12 14:11:34 +08:00
19 changed files with 831 additions and 505 deletions

View File

@@ -43,7 +43,7 @@ def on_openid_login_success(sender, user=None, request=None, **kwargs):
@receiver(populate_user)
def on_ldap_create_user(sender, user, ldap_user, **kwargs):
if user and user.username != 'admin':
if user and user.username not in ['admin']:
user.source = user.SOURCE_LDAP
user.save()