mgoetz/ldap_account_manager
Archived
2
2
Fork 0
Code Issues 9 Pull Requests Releases 2 Wiki Activity

Fix user detail wrong first, last name order; Fix user invalid login page on valid login.

Browse Source
This commit is contained in:
Götz 2019-04-12 18:23:57 +02:00
parent e74878c0c4
commit 26cfc9e334
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
account_manager/main_views.py
View File

@ -41,9 +41,11 @@ def realm_list(request):
if len(realms) == 0 and not user.is_superuser: if len(realms) == 0 and not user.is_superuser:
try: try:
LdapUser.base_dn = LdapUser.ROOT_DN
user = LdapUser.objects.get(username=user.username) 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) realm = Realm.objects.get(ldap_base_dn=realm_base_dn)
return redirect('realm-user-detail', realm.id, user.dn) return redirect('realm-user-detail', realm.id, user.dn)
except ObjectDoesNotExist as err: except ObjectDoesNotExist as err:
logger.info('Anmeldung fehlgeschlagen', err) logger.info('Anmeldung fehlgeschlagen', err)
@ -103,7 +105,6 @@ def realm_detail(request, realm_id):
realm = Realm.objects.get(id=realm_id) realm = Realm.objects.get(id=realm_id)
ldap_admin_group = None ldap_admin_group = None
ldap_default_group = None ldap_default_group = None
print('ADMIN GROUP', realm.admin_group)
if realm.admin_group: if realm.admin_group:
LdapGroup.base_dn = f'ou=groups,{realm.ldap_base_dn}' LdapGroup.base_dn = f'ou=groups,{realm.ldap_base_dn}'
ldap_admin_group = LdapGroup.objects.get(name=realm.admin_group.name) ldap_admin_group = LdapGroup.objects.get(name=realm.admin_group.name)

2
templates/user/user_detail.jinja2
View File

@ -9,7 +9,7 @@
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<h5 class="card-title">{{ user.username }}</h5> <h5 class="card-title">{{ user.username }}</h5>
<h6 class="card-subtitle mb-2 text-muted">{{ user.first_name }}, {{ user.last_name }}</h6> <h6 class="card-subtitle mb-2 text-muted">{{ user.last_name }}, {{ user.first_name }}</h6>
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush">
{% if groups %} {% if groups %}
<li class="list-group-item"> <li class="list-group-item">