mgoetz/ldap_account_manager
Archived
2
2
Fork 0
Code Issues 9 Pull Requests Releases 2 Wiki Activity

Merge branch 'master' into dev_translation

Browse Source
This commit is contained in:
Götz 2019-05-18 00:31:40 +02:00
commit df159d579d
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

2
docker/lama/dev.env
View File

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

2
src/core/docker_settings.py
View File

@ -21,7 +21,7 @@ SITE_NAME = os.environ['SITE_NAME']
SECRET_KEY = os.environ['SECRET_KEY'] SECRET_KEY = os.environ['SECRET_KEY']
DEBUG = os.environ.get('DEBUG', 'False') == 'True' DEBUG = os.environ.get('DEBUG', 'False') == 'True'
ALLOWED_HOSTS = os.environ['ALLOWED_HOSTS'].split() 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 # Application definition
INSTALLED_APPS = [ INSTALLED_APPS = [

13
src/templates/realm/realm_detailed.jinja2
View File

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