From 95bd7ba88aad0c42ce5213c9841a2380bbea9814 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20G=C3=B6tz?=
 <michael-guenther.goetz@stud.uni-bamberg.de>
Date: Fri, 29 Mar 2019 04:26:33 +0100
Subject: [PATCH] Change user flow - realm sites

---
 account_manager/views.py              | 8 ++++----
 templates/realm/realm_detailed.jinja2 | 2 +-
 templates/realm/realm_home.jinja2     | 2 --
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/account_manager/views.py b/account_manager/views.py
index cce8dcb..d6bde37 100644
--- a/account_manager/views.py
+++ b/account_manager/views.py
@@ -20,8 +20,8 @@ def realm(request):
         form = RealmAddForm(request.POST)
         if form.is_valid():
             name = form.cleaned_data['name']
-            ldap_rdn_org = form.cleaned_data['ldap_rdn_org']
-            realm_obj = Realm.objects.create(name=name, ldap_rdn_org=ldap_rdn_org)
+            ldap_base_dn = form.cleaned_data['ldap_base_dn']
+            realm_obj = Realm.objects.create(name=name, ldap_base_dn=ldap_base_dn)
             realm_obj.save()
             return redirect('realm-detail', realm_obj.id)
     else:
@@ -101,7 +101,7 @@ def user_add(request, realm_id):
             password = form.cleaned_data['password']
             first_name = form.cleaned_data['first_name']
             last_name = form.cleaned_data['last_name']
-            LdapUser.base_dn = realm_obj.ldap_base_dn
+            LdapUser.base_dn = f'ou=people,{realm_obj.ldap_base_dn}'
             LdapUser.objects.create(username=username,
                                     password=password, first_name=first_name,
                                     last_name=last_name, )
@@ -130,7 +130,7 @@ def group_add(request, realm_id):
             name = form.cleaned_data['name']
             members = form.cleaned_data['members']
             members = [member.dn for member in members]
-            LdapGroup.base_dn = realm_obj.ldap_base_dn
+            LdapGroup.base_dn = f'ou=groups,{realm_obj.ldap_base_dn}'
             LdapGroup.objects.create(name=name, members=members)
             return redirect('realm-group-list', realm_id)
 
diff --git a/templates/realm/realm_detailed.jinja2 b/templates/realm/realm_detailed.jinja2
index ab24e84..e44d073 100644
--- a/templates/realm/realm_detailed.jinja2
+++ b/templates/realm/realm_detailed.jinja2
@@ -1,6 +1,6 @@
 {% extends 'base.jinja2' %}
 {% block content %}
-    <a href="{{ url('user-add') }}">Nutzer anlegen</a> | <a href="{{ url('group-add') }}">Gruppe anlegen</a>
+    <a href="{{ url('realm-home') }}">Zurück zur Realmübersicht</a>
     <h1>Bereich {{ realm.name }}</h1>
     <h2>Bereich Info</h2>
     <p>LDAP OU: {{ realm.ldap_base_dn }}</p>
diff --git a/templates/realm/realm_home.jinja2 b/templates/realm/realm_home.jinja2
index db1b8bd..4bfdfaa 100644
--- a/templates/realm/realm_home.jinja2
+++ b/templates/realm/realm_home.jinja2
@@ -1,7 +1,5 @@
 {% extends 'base.jinja2' %}
 {% block content %}
-    <a href="{{ url('user-add') }}">Nutzer anlegen</a> | <a href="{{ url('group-add') }}">Gruppe anlegen</a>
-
     <h2>Neuen Bereich anlegen</h2>
     <form method="post">
         <input type="hidden" name="csrfmiddlewaretoken" value="{{ csrf_token }}">