diff --git a/src/account_manager/main_views.py b/src/account_manager/main_views.py index e14c0c8..b6c3342 100644 --- a/src/account_manager/main_views.py +++ b/src/account_manager/main_views.py @@ -8,13 +8,13 @@ from django.contrib.auth.models import Group, User from django.core.exceptions import ObjectDoesNotExist from django.db import IntegrityError from django.shortcuts import render, redirect, HttpResponse -from datetime import datetime, timedelta +from ldap import LDAPError from account_helper.models import Realm from account_manager.utils.mail_utils import realm_send_mail +from account_manager.utils.main_views import render_realm_detail_page from .forms import RealmAddForm, RealmUpdateForm from .models import LdapGroup, LdapUser -from ldap import LDAPError logger = logging.getLogger(__name__) @@ -109,17 +109,6 @@ 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) - 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(), - 'notice': notice}) - - def get_default_admin_group(realm): ldap_admin_group = None ldap_default_group = None diff --git a/src/account_manager/utils/main_views.py b/src/account_manager/utils/main_views.py new file mode 100644 index 0000000..8492099 --- /dev/null +++ b/src/account_manager/utils/main_views.py @@ -0,0 +1,16 @@ +from django.shortcuts import render + +from account_helper.models import Realm +from account_manager.main_views import get_default_admin_group +from account_manager.models import LdapUser + + +def render_realm_detail_page(realm_id, request, notice=""): + realm = Realm.objects.get(id=realm_id) + 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(), + 'notice': notice}) \ No newline at end of file