From 276dd087949878c10f1dd39081583b8909ce81d9 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Thu, 2 Mar 2023 18:18:51 +0200
Subject: [PATCH] fix: Don't offer already-disabled API keys for disablement
 (#5262)

* fix: Don't offer already-disabled API keys for disablement

Fixes #3441

* Remove test class
---
 ietf/ietfauth/views.py               | 2 +-
 ietf/templates/ietfauth/apikeys.html | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ietf/ietfauth/views.py b/ietf/ietfauth/views.py
index b29b29321..c02f2f2c0 100644
--- a/ietf/ietfauth/views.py
+++ b/ietf/ietfauth/views.py
@@ -777,7 +777,7 @@ def apikey_create(request):
 @person_required
 def apikey_disable(request):
     person = request.user.person
-    choices = [ (k.hash(), str(k)) for k in person.apikeys.all() ]
+    choices = [ (k.hash(), str(k)) for k in person.apikeys.exclude(valid=False) ]
     #
     class KeyDeleteForm(forms.Form):
         hash = forms.ChoiceField(label='Key', choices=choices)
diff --git a/ietf/templates/ietfauth/apikeys.html b/ietf/templates/ietfauth/apikeys.html
index ab6194151..5ac7f6f45 100644
--- a/ietf/templates/ietfauth/apikeys.html
+++ b/ietf/templates/ietfauth/apikeys.html
@@ -37,9 +37,9 @@
                 <td>{{ key.created }}</td>
                 <td>{{ key.latest }}</td>
                 <td>{{ key.count }}</td>
-                <td>{{ key.valid }}</td>
+                <td class="{{ key.valid|yesno:'text-success,text-danger'}}">{{ key.valid }}</td>
                 <td>
-                    <code>{{ key.hash }}</code>
+                    <code {% if not key.valid %}class="text-decoration-line-through"{% endif %}>{{ key.hash }}</code>
                 </td>
                 <td >
                     {% if key.valid %}
@@ -63,4 +63,4 @@
 {% endblock %}
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file