From 5dcafd2bc6ab25322a3731862286b2bde2d2d838 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 01:27:48 +0100
Subject: [PATCH] Rename save buttons

---
 account_manager/forms.py             |  4 ++--
 account_manager/views.py             |  4 ++--
 templates/realm/realm_detailed.jinja |  6 +-----
 templates/realm/realm_home.jinja     | 10 +++++-----
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/account_manager/forms.py b/account_manager/forms.py
index 6adc16c..a551f78 100644
--- a/account_manager/forms.py
+++ b/account_manager/forms.py
@@ -1,7 +1,7 @@
 from django import forms
 from django.contrib.auth.models import User, Group
 from account_helper.models import LdapUserRDN, LdapGroupRDN
-from .models import LdapUser
+from .models import LdapUser, LdapGroup
 
 
 class AddLDAPUserForm(forms.Form):
@@ -27,4 +27,4 @@ class RealmUpdateForm(forms.Form):
     ldap_rdn_org = forms.CharField(label='ldap_rdn_org', max_length=200)
     name = forms.CharField(label='name', max_length=200)
     email = forms.EmailField()
-    admins = forms.ModelChoiceField(widget=forms.CheckboxSelectMultiple, queryset=Group.objects.all())
+    admin_group = forms.ModelChoiceField(widget=forms.CheckboxSelectMultiple, queryset=LdapGroup.objects.all())
diff --git a/account_manager/views.py b/account_manager/views.py
index 7e333e1..4964490 100644
--- a/account_manager/views.py
+++ b/account_manager/views.py
@@ -44,10 +44,10 @@ def realm_detail(request, id):
                 return redirect('realm-detail', realm_obj.id)
         else:
             form = RealmUpdateForm(initial=data)
-            return render(request, 'realm/realm_home.jinja', {'realm': realm_obj, 'form': form})
+            return render(request, 'realm/realm_detailed.jinja', {'realm': realm_obj, 'form': form})
     else:
         realm_obj = Realm.objects.get(id=id)
-        return render(request, 'realm/realm_home.jinja', {'realm': realm_obj})
+        return render(request, 'realm/realm_detailed.jinja', {'realm': realm_obj})
 
 
 def userlist(request):
diff --git a/templates/realm/realm_detailed.jinja b/templates/realm/realm_detailed.jinja
index 95d6996..d6c80ac 100644
--- a/templates/realm/realm_detailed.jinja
+++ b/templates/realm/realm_detailed.jinja
@@ -6,10 +6,6 @@
     <form method="post">
         <input type="hidden" name="csrfmiddlewaretoken" value="{{ csrf_token }}">
         {{ form.as_p()|safe }}
-        <button type="submit">Login</button>
+        <button type="submit">Speichern</button>
     </form>
-    <h2>Realms</h2>
-    {% for realm in realms %}
-        <p>{{ realm.name }}</p>
-    {% endfor %}
 {% endblock %}
diff --git a/templates/realm/realm_home.jinja b/templates/realm/realm_home.jinja
index cbb5497..3f84564 100644
--- a/templates/realm/realm_home.jinja
+++ b/templates/realm/realm_home.jinja
@@ -4,12 +4,12 @@
 
     <h2>Neuen Bereich anlegen</h2>
     <form method="post">
-                    <input type="hidden" name="csrfmiddlewaretoken" value="{{ csrf_token }}">
-                    {{ form.as_p()|safe }}
-                    <button type="submit">Login</button>
-                </form>
+        <input type="hidden" name="csrfmiddlewaretoken" value="{{ csrf_token }}">
+        {{ form.as_p()|safe }}
+        <button type="submit">Anlegen</button>
+    </form>
     <h2>Realms</h2>
     {% for realm in realms %}
-        <p>{{ realm.name }}</p>
+        <p><a href="{{ url('realm-detail', args=[realm.id]) }}">{{ realm.name }}</a></p>
     {% endfor %}
 {% endblock %}