diff --git a/docker/lama/dev.env b/docker/lama/dev.env index 1f640cd..d91d21c 100644 --- a/docker/lama/dev.env +++ b/docker/lama/dev.env @@ -30,3 +30,13 @@ DEFAULT_FROM_EMAIL= SERVER_EMAIL= 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 diff --git a/src/account_manager/main_views.py b/src/account_manager/main_views.py index a4c8da4..645133d 100644 --- a/src/account_manager/main_views.py +++ b/src/account_manager/main_views.py @@ -105,16 +105,18 @@ def base_dn_available(base_dn): @login_required @is_realm_admin 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) - 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) - + LdapUser.base_dn = realm.ldap_base_dn + inactive_users = LdapUser.get_inactive_users().count() return render(request, 'realm/realm_detailed.jinja2', {'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): @@ -241,6 +243,4 @@ def realm_email_test(request, realm_id): 'error': f'Mail konnte nicht versendet werden. Bitte kontaktieren sie den Administrator', 'ldap_admin_group': ldap_admin_group, 'ldap_default_group': ldap_default_group}) - return render(request, 'realm/realm_detailed.jinja2', - {'realm': realm, 'notice': 'Test erfolgreich', 'ldap_admin_group': ldap_admin_group, - 'ldap_default_group': ldap_default_group}) + return render_realm_detail_page(realm_id, request, notice='Test erfolgreich')