Standardize realm detail page

This commit is contained in:
Götz 2019-05-28 20:33:15 +02:00
parent fac000e39c
commit b00ecd576b
2 changed files with 19 additions and 9 deletions

View File

@ -30,3 +30,13 @@ DEFAULT_FROM_EMAIL=
SERVER_EMAIL= SERVER_EMAIL=
DELETION_WAIT_DAYS=14 DELETION_WAIT_DAYS=14
#EMAIL_BACKEND=smtp
#EMAIL_HOST=smtp.uni-bamberg.de
#EMAIL_PORT=587
#EMAIL_USE_TLS=False
#EMAIL_USE_SSL=False
#DEFAULT_FROM_EMAIL=vergesslich@uni-bamberg.de
##DEFAULT_FROM_EMAIL=fachschaft-wiai.stuve@uni-bamberg.de
#SERVER_EMAIL=fachschaft-wiai.stuve@uni-bamberg.de

View File

@ -105,16 +105,18 @@ def base_dn_available(base_dn):
@login_required @login_required
@is_realm_admin @is_realm_admin
def realm_detail(request, realm_id): def realm_detail(request, realm_id):
return render_realm_detail_page(realm_id, request)
def render_realm_detail_page(realm_id, request, notice=""):
realm = Realm.objects.get(id=realm_id) realm = Realm.objects.get(id=realm_id)
LdapUser.base_dn = realm.ldap_base_dn
inactive_users = LdapUser.get_inactive_users().count()
logger.info(inactive_users)
ldap_admin_group, ldap_default_group = get_default_admin_group(realm) ldap_admin_group, ldap_default_group = get_default_admin_group(realm)
LdapUser.base_dn = realm.ldap_base_dn
inactive_users = LdapUser.get_inactive_users().count()
return render(request, 'realm/realm_detailed.jinja2', return render(request, 'realm/realm_detailed.jinja2',
{'realm': realm, 'ldap_admin_group': ldap_admin_group, 'ldap_default_group': ldap_default_group, {'realm': realm, 'ldap_admin_group': ldap_admin_group, 'ldap_default_group': ldap_default_group,
'inactive_user_count': inactive_users, 'users_count': LdapUser.objects.all().count()}) 'inactive_user_count': inactive_users, 'users_count': LdapUser.objects.all().count(),
'notice': notice})
def get_default_admin_group(realm): def get_default_admin_group(realm):
@ -241,6 +243,4 @@ def realm_email_test(request, realm_id):
'error': f'Mail konnte nicht versendet werden. Bitte kontaktieren sie den Administrator', 'error': f'Mail konnte nicht versendet werden. Bitte kontaktieren sie den Administrator',
'ldap_admin_group': ldap_admin_group, 'ldap_admin_group': ldap_admin_group,
'ldap_default_group': ldap_default_group}) 'ldap_default_group': ldap_default_group})
return render(request, 'realm/realm_detailed.jinja2', return render_realm_detail_page(realm_id, request, notice='Test erfolgreich')
{'realm': realm, 'notice': 'Test erfolgreich', 'ldap_admin_group': ldap_admin_group,
'ldap_default_group': ldap_default_group})