Merge branch 'master' into dev_translation

.gitignore

@@ -118,5 +118,6 @@ dmypy.json
 migrations/
 logs/
 db/
+data/
 !docker/ldap/data/var/
 *.mdb

docker/lama/dev.env

@@ -28,3 +28,5 @@ LDAP_GROUP_NAME_ATTR=cn
 EMAIL_BACKEND=file
 DEFAULT_FROM_EMAIL=
 SERVER_EMAIL=
+
+DELETION_WAIT_DAYS=14

src/core/docker_settings.py

@@ -21,7 +21,7 @@ SITE_NAME = os.environ['SITE_NAME']
 SECRET_KEY = os.environ['SECRET_KEY']
 DEBUG = os.environ.get('DEBUG', 'False') == 'True'
 ALLOWED_HOSTS = os.environ['ALLOWED_HOSTS'].split()
-DELETION_WAIT_DAYS = os.environ.get('DELETION_WAIT_DAYS', 14)
+DELETION_WAIT_DAYS = int(os.environ.get('DELETION_WAIT_DAYS', "14"))
 
 # Application definition
 INSTALLED_APPS = [

src/templates/realm/realm_detailed.jinja2

@@ -21,11 +21,14 @@
             {% block detail_content %}
                 <ul class="list-group list-group-flush w-100">
                     <li class="list-group-item">LDAP Organisationseinheit: {{ realm.ldap_base_dn }}</li>
-                    <li class="list-group-item">Nutzeranzahl: {{ users_count }}</li>
-                    <li class="list-group-item">Inaktive Nutzer: {{ inactive_user_count }} <a
-                            href="{{ url('realm-multiple-user-delete-inactive', args=[realm.id]) }}"
-                            class="float-right">
-                        Inaktive Nutzer löschen</a></li>
+                    <li class="list-group-item">Nutzeranzahl (Aktive/Inaktive): {{ users_count }}
+                        ({{ users_count-inactive_user_count }}/{{ inactive_user_count }})
+                        <a
+                                href="{{ url('realm-multiple-user-delete-inactive', args=[realm.id]) }}"
+                                class="float-right">
+                            Inaktive Nutzer löschen
+                        </a>
+                    </li>
                     {% if realm.email %}
                         <li class="list-group-item">Email: {{ realm.email }}</li>
                     {% else %}