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

Update user deletion button visability

Browse Source
This commit is contained in:
Götz 2019-05-16 14:29:00 +02:00
parent c2955968bc
commit a614b1f160
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ class Command(BaseCommand):
)
def handle(self, *args, **options):
deletables = DeletedUser.objects.filter(deletion_date__lte=timezone.now())
deletables = DeletedUser.objects.filter(deletion_date__lte=timezone.now() + timezone.timedelta(+15))
output = ""
if options['json']:
json_output = {'deletables': []}

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

@ -56,7 +56,8 @@
<i class="far fa-times-circle text-danger"></i><span class="d-none">+</span>
{% endif %}</li>
{% if user.deleted_user.deletion_date %}
<li class="list-group-item text-danger">Löschvorgang: {{ user.deleted_user.deletion_date.strftime('%d.%m.%Y') }}
<li class="list-group-item text-danger">
Löschvorgang: {{ user.deleted_user.deletion_date.strftime('%d.%m.%Y') }}
<a href="{{ url('realm-user-delete-cancel', args=[realm.id, user.user.dn]) }}"
class="float-right">
Löschvorgang abbrechen</a>
@ -64,20 +65,24 @@
{% endif %}
</ul>
<div class="d-flex mt-3">
{% if not user.deleted_user.deletion_date %}
<a href="{{ url('realm-user-update', args = [realm.id, user.user.dn]) }}"
class="btn btn-primary mr-auto p-2">
<i class="fas fa-user-cog"></i> Nutzer bearbeiten
</a>
{% if not user.last_login %}
{% if not user.user.last_login %}
<a href="{{ url('realm-user-resend-welcome-mail', args = [realm.id, user.user.dn]) }}"
class="btn btn-secondary p-2 mr-2">
<i class="fas fa-paper-plane"></i> Wilkommensmail erneut senden
</a>
{% endif %}
<a href="{{ url('realm-user-delete-confirm', args = [realm.id, user.user.dn]) }}"
class="btn btn-danger p-2">
<i class="fas fa-trash"></i> Nutzer löschen
</a>
{% endif %}
</div>
{% else %}
<form method="post">