From 604f7af5ff6381e5c2f04686b2adf49810e5d116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20G=C3=B6tz?= Date: Tue, 28 May 2019 21:17:20 +0200 Subject: [PATCH] Fix thuy again --- src/account_manager/main_views.py | 2 +- src/account_manager/views/user_views.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/account_manager/main_views.py b/src/account_manager/main_views.py index 645133d..cb320d1 100644 --- a/src/account_manager/main_views.py +++ b/src/account_manager/main_views.py @@ -45,7 +45,7 @@ def realm_list(request): try: LdapUser.base_dn = LdapUser.ROOT_DN user = LdapUser.objects.get(username=user.username) - realm_base_dn = re.compile('(uid=[a-zA-Z0-9_]*),(ou=[a-zA-Z_]*),(.*)').match(user.dn).group(3) + realm_base_dn = re.compile('(uid=[a-zA-Z0-9_-]*),(ou=[a-zA-Z_-]*),(.*)').match(user.dn).group(3) realm = Realm.objects.get(ldap_base_dn=realm_base_dn) return redirect('user-detail', realm.id, user.dn) diff --git a/src/account_manager/views/user_views.py b/src/account_manager/views/user_views.py index 7581422..2533436 100644 --- a/src/account_manager/views/user_views.py +++ b/src/account_manager/views/user_views.py @@ -147,7 +147,7 @@ def realm_user_resend_password_reset(request, realm_id, user_dn): ldap_user = LdapUser.objects.get(dn=user_dn) try: if ldap_user.email: - logger.info("Sending email for to this email:", ldap_user.email) + logger.info(f"Sending email to {ldap_user.email}") form = PasswordResetForm({'email': ldap_user.email}) if form.is_valid(): logger.info('CREATE REQUEST') @@ -164,7 +164,7 @@ def realm_user_resend_password_reset(request, realm_id, user_dn): email_template_name='registration/password_reset_email.html') except Exception as e: - logger.info('Error') + logger.error('Error') return redirect('realm-user-detail', realm_id, user_dn)