From adbaf926aeeed0428f496b6f9cafe675751d5867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20G=C3=B6tz?=
 <michael-guenther.goetz@stud.uni-bamberg.de>
Date: Thu, 11 Apr 2019 21:08:28 +0200
Subject: [PATCH] Update layout

---
 account_manager/main_views.py        | 1 +
 account_manager/views/group_views.py | 6 ++++++
 templates/base_admin.jinja2          | 5 ++---
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/account_manager/main_views.py b/account_manager/main_views.py
index 77a2811..0175979 100644
--- a/account_manager/main_views.py
+++ b/account_manager/main_views.py
@@ -85,6 +85,7 @@ def realm_detail(request, realm_id):
     realm = Realm.objects.get(id=realm_id)
     ldap_admin_group = None
     ldap_default_group = None
+    print('ADMIN GROUP', realm.admin_group)
     if realm.admin_group:
         LdapGroup.base_dn = f'ou=groups,{realm.ldap_base_dn}'
         ldap_admin_group = LdapGroup.objects.get(name=realm.admin_group.name)
diff --git a/account_manager/views/group_views.py b/account_manager/views/group_views.py
index 9565a22..f9fd5f3 100644
--- a/account_manager/views/group_views.py
+++ b/account_manager/views/group_views.py
@@ -109,6 +109,12 @@ def group_delete(request, realm_id, group_dn):
     realm = Realm.objects.get(id=realm_id)
     LdapGroup.base_dn = f'ou=groups,{realm.ldap_base_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()
 
     return redirect('realm-group-list', realm_id)
diff --git a/templates/base_admin.jinja2 b/templates/base_admin.jinja2
index 112b775..fae146a 100644
--- a/templates/base_admin.jinja2
+++ b/templates/base_admin.jinja2
@@ -4,7 +4,7 @@
     <div class="d-flex wrapper">
         <div class="bg-light border-right sidebar-wrapper">
             {% if realms %}
-                <h2 class="sidebar-heading">Realms</h2>
+                <h2 class="sidebar-heading">Bereiche</h2>
                 <div class="list-group list-group-flush">
                     {% for realm_item in realms %}
                         <a href="{{ url('realm-detail', args=[realm_item.id]) }}"
@@ -12,11 +12,10 @@
                     {% endfor %}
                 </div>
             {% else %}
-                <h2 class="sidebar-heading">Bereich</h2>
                 <a href="{{ url('realm-home') }}" class="list-group-item list-group-item-action bg-light">
                     <i class="fas fa-list"></i> Bereichsübersicht</a>
                 {% if realm %}
-                    <h2 class="sidebar-heading">{{ realm.name }}</h2>
+                    <h2 class="sidebar-heading">Bereich {{ realm.name }}</h2>
                     <div class="list-group list-group-flush">
                         <a href="{{ url('realm-detail', args=[realm.id]) }}"
                            class="list-group-item list-group-item-action bg-light"><i class="fas fa-cogs"></i>