altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

fix: Don't offer already-disabled API keys for disablement (#5262)

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

Fixes #3441

* Remove test class
This commit is contained in:
Lars Eggert 2023-03-02 18:18:51 +02:00 committed by GitHub
parent 5fc93bb8ca
commit 276dd08794
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/ietfauth/views.py
View file

@ -777,7 +777,7 @@ def apikey_create(request):
@person_required @person_required
def apikey_disable(request): def apikey_disable(request):
person = request.user.person 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): class KeyDeleteForm(forms.Form):
hash = forms.ChoiceField(label='Key', choices=choices) hash = forms.ChoiceField(label='Key', choices=choices)

6
ietf/templates/ietfauth/apikeys.html
View file

@ -37,9 +37,9 @@
<td>{{ key.created }}</td> <td>{{ key.created }}</td>
<td>{{ key.latest }}</td> <td>{{ key.latest }}</td>
<td>{{ key.count }}</td> <td>{{ key.count }}</td>
<td>{{ key.valid }}</td> <td class="{{ key.valid|yesno:'text-success,text-danger'}}">{{ key.valid }}</td>
<td> <td>
<code>{{ key.hash }}</code> <code {% if not key.valid %}class="text-decoration-line-through"{% endif %}>{{ key.hash }}</code>
</td> </td>
<td > <td >
{% if key.valid %} {% if key.valid %}
@ -63,4 +63,4 @@
{% endblock %} {% endblock %}
{% block js %} {% block js %}
<script src="{% static "ietf/js/list.js" %}"></script> <script src="{% static "ietf/js/list.js" %}"></script>
{% endblock %} {% endblock %}