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

UI tweak

Browse Source
This commit is contained in:
Götz 2019-05-18 17:53:47 +02:00
parent fac000e39c
commit 7734a0d36f
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/account_helper/management/commands/deletable.py
View File

@ -15,16 +15,24 @@ class Command(BaseCommand):
parser.add_argument( parser.add_argument(
'--delete', '--delete',
action='store_true', action='store_true',
help='Delete poll instead of closing it', help='Delete users which deletion time is lower than the current date',
) )
parser.add_argument( parser.add_argument(
'--json', '--json',
action='store_true', action='store_true',
help='Return an json encoded String', help='Return an json encoded String',
) )
parser.add_argument(
'--all',
action='store_true',
help='Delete all marked user, --delete is required',
)
def handle(self, *args, **options): def handle(self, *args, **options):
deletables = DeletedUser.objects.filter(deletion_date__lte=timezone.now()) if options['all']:
deletables = DeletedUser.objects.all()
else:
deletables = DeletedUser.objects.filter(deletion_date__lte=timezone.now())
output = "" output = ""
if options['json']: if options['json']:
json_output = {'deletables': []} json_output = {'deletables': []}
@ -34,7 +42,6 @@ class Command(BaseCommand):
else: else:
for user in deletables: for user in deletables:
output += f'{user}\n' output += f'{user}\n'
if options['delete']: if options['delete']:
LdapUser.base_dn = LdapUser.ROOT_DN LdapUser.base_dn = LdapUser.ROOT_DN
for user in deletables: for user in deletables:
@ -48,4 +55,10 @@ class Command(BaseCommand):
pass pass
if not options['json']: if not options['json']:
output += '\nSuccessfully deleted all listed users' output += '\nSuccessfully deleted all listed users'
self.stdout.write(self.style.SUCCESS(output)) if output:
self.stdout.write(self.style.SUCCESS(output))
else:
for deletable in deletables:
self.stdout.write(self.style.SUCCESS(deletable))

16
src/templates/user/realm_user_detail.jinja2
View File

@ -26,14 +26,22 @@
<span class="text-warning"> Noch nicht generiert </span> <span class="text-warning"> Noch nicht generiert </span>
{% endif %} {% endif %}
</li> </li>
<li class="list-group-item">Vorname: {{ user.user.first_name }}</li> {% if user.user.phone %}
<li class="list-group-item">Nachname: {{ user.user.last_name }}</li> <li class="list-group-item">Vorname: {{ user.user.first_name }}</li>
{% endif %}
{% if user.user.phone %}
<li class="list-group-item">Nachname: {{ user.user.last_name }}</li>
{% endif %}
<li class="list-group-item">Email: {{ user.user.email }}</li> <li class="list-group-item">Email: {{ user.user.email }}</li>
<li class="list-group-item">Passwort: <a <li class="list-group-item">Passwort: <a
href="{{ url('realm-user-password-reset', args = [realm.id, user.user.dn]) }}" class="float-right">Nutzerpasswort href="{{ url('realm-user-password-reset', args = [realm.id, user.user.dn]) }}" class="float-right">Nutzerpasswort
zurücksetzen</a></li> zurücksetzen</a></li>
<li class="list-group-item">Telefon: {{ user.user.phone }}</li> {% if user.user.phone %}
<li class="list-group-item">Mobiltelefon: {{ user.user.mobile_phone }}</li> <li class="list-group-item">Telefon: {{ user.user.phone }}</li>
{% endif %}
{% if user.user.mobile_phone %}
<li class="list-group-item">Mobiltelefon: {{ user.user.mobile_phone }}</li>
{% endif %}
<li class="list-group-item">Gruppen: <li class="list-group-item">Gruppen:
{% if groups %} {% if groups %}
{% for group in groups %} {% for group in groups %}