From a614b1f16044b901200b4799e92119357307b957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20G=C3=B6tz?=
 <michael-guenther.goetz@stud.uni-bamberg.de>
Date: Thu, 16 May 2019 14:29:00 +0200
Subject: [PATCH] Update user deletion button visability

---
 .../management/commands/deletable.py          |  2 +-
 src/templates/user/realm_user_detail.jinja2   | 31 +++++++++++--------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/account_helper/management/commands/deletable.py b/src/account_helper/management/commands/deletable.py
index e0788a6..da34868 100644
--- a/src/account_helper/management/commands/deletable.py
+++ b/src/account_helper/management/commands/deletable.py
@@ -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': []}
diff --git a/src/templates/user/realm_user_detail.jinja2 b/src/templates/user/realm_user_detail.jinja2
index c2a6fc3..0480f4e 100644
--- a/src/templates/user/realm_user_detail.jinja2
+++ b/src/templates/user/realm_user_detail.jinja2
@@ -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">
-            <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 %}
-                <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
+            {% 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.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 %}
-            <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>
         </div>
     {% else %}
         <form method="post">