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-tools · Mar 2, 2023 · 276dd08 · 276dd08
1 parent 5fc93bb
commit 276dd08
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ietf/ietfauth/views.py b/ietf/ietfauth/views.py
@@ -777,7 +777,7 @@ class Meta:
 @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
@@ -37,9 +37,9 @@ <h1>
                 <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 @@ <h1>
 {% endblock %}
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
+{% endblock %}