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

Update layout

Browse Source
This commit is contained in:
Götz 2019-04-11 21:08:28 +02:00
parent 1b32a2f2b5
commit adbaf926ae
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
account_manager/main_views.py
View File

@ -85,6 +85,7 @@ 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)

6
account_manager/views/group_views.py
View File

@ -109,6 +109,12 @@ def group_delete(request, realm_id, group_dn):
realm = Realm.objects.get(id=realm_id) realm = Realm.objects.get(id=realm_id)
LdapGroup.base_dn = f'ou=groups,{realm.ldap_base_dn}' LdapGroup.base_dn = f'ou=groups,{realm.ldap_base_dn}'
group = LdapGroup.objects.get(dn=group_dn) group = LdapGroup.objects.get(dn=group_dn)
if realm.admin_group and realm.admin_group.name == group.name:
realm.admin_group = None
realm.save()
if realm.default_group and realm.default_group.name == group.name:
realm.default_group = None
realm.save()
group.delete() group.delete()
return redirect('realm-group-list', realm_id) return redirect('realm-group-list', realm_id)

5
templates/base_admin.jinja2
View File

@ -4,7 +4,7 @@
<div class="d-flex wrapper"> <div class="d-flex wrapper">
<div class="bg-light border-right sidebar-wrapper"> <div class="bg-light border-right sidebar-wrapper">
{% if realms %} {% if realms %}
<h2 class="sidebar-heading">Realms</h2> <h2 class="sidebar-heading">Bereiche</h2>
<div class="list-group list-group-flush"> <div class="list-group list-group-flush">
{% for realm_item in realms %} {% for realm_item in realms %}
<a href="{{ url('realm-detail', args=[realm_item.id]) }}" <a href="{{ url('realm-detail', args=[realm_item.id]) }}"
@ -12,11 +12,10 @@
{% endfor %} {% endfor %}
</div> </div>
{% else %} {% else %}
<h2 class="sidebar-heading">Bereich</h2>
<a href="{{ url('realm-home') }}" class="list-group-item list-group-item-action bg-light"> <a href="{{ url('realm-home') }}" class="list-group-item list-group-item-action bg-light">
<i class="fas fa-list"></i> Bereichsübersicht</a> <i class="fas fa-list"></i> Bereichsübersicht</a>
{% if realm %} {% if realm %}
<h2 class="sidebar-heading">{{ realm.name }}</h2> <h2 class="sidebar-heading">Bereich {{ realm.name }}</h2>
<div class="list-group list-group-flush"> <div class="list-group list-group-flush">
<a href="{{ url('realm-detail', args=[realm.id]) }}" <a href="{{ url('realm-detail', args=[realm.id]) }}"
class="list-group-item list-group-item-action bg-light"><i class="fas fa-cogs"></i> class="list-group-item list-group-item-action bg-light"><i class="fas fa-cogs"></i>