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.as_p()|safe }} - +
-

Realms

- {% for realm in realms %} -

{{ realm.name }}

- {% 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 @@

Neuen Bereich anlegen

- - {{ form.as_p()|safe }} - -
+ + {{ form.as_p()|safe }} + +

Realms

{% for realm in realms %} -

{{ realm.name }}

+

{{ realm.name }}

{% endfor %} {% endblock %}