This is an automated email from the ASF dual-hosted git repository.
sbp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-release.git
The following commit(s) were added to refs/heads/main by this push:
new 2eb9a89 Do not show standing committees in the list of keys for
committees
2eb9a89 is described below
commit 2eb9a8926340b1fa874292cfa55d43bd9609794a
Author: Sean B. Palmer <[email protected]>
AuthorDate: Fri Jun 13 15:16:18 2025 +0100
Do not show standing committees in the list of keys for committees
---
atr/routes/keys.py | 1 +
atr/templates/keys-review.html | 64 ++++++++++++++++++++++--------------------
2 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/atr/routes/keys.py b/atr/routes/keys.py
index c6e0a6a..eea7320 100644
--- a/atr/routes/keys.py
+++ b/atr/routes/keys.py
@@ -283,6 +283,7 @@ async def keys(session: routes.CommitterSession) -> str:
delete_form=delete_form,
update_committee_keys_form=update_committee_keys_form,
email_from_key=util.email_from_uid,
+ committee_is_standing=util.committee_is_standing,
)
diff --git a/atr/templates/keys-review.html b/atr/templates/keys-review.html
index aeb5b6f..646115a 100644
--- a/atr/templates/keys-review.html
+++ b/atr/templates/keys-review.html
@@ -166,39 +166,41 @@
class="btn btn-outline-primary">Upload a KEYS file</a>
</div>
{% for committee in committees %}
- <h3 id="committee-{{ committee.name|slugify }}" class="mt-3">{{
committee.display_name }}</h3>
- {% if committee.public_signing_keys %}
- <div class="table-responsive mb-2">
- <table class="table border table-striped table-hover table-sm">
- <thead>
- <tr>
- <th class="px-2" scope="col">Fingerprint</th>
- <th class="px-2" scope="col">Email</th>
- <th class="px-2" scope="col">Apache UID</th>
- </tr>
- </thead>
- <tbody>
- {% for key in committee.public_signing_keys %}
+ {% if not committee_is_standing(committee.name) %}
+ <h3 id="committee-{{ committee.name|slugify }}" class="mt-3">{{
committee.display_name }}</h3>
+ {% if committee.public_signing_keys %}
+ <div class="table-responsive mb-2">
+ <table class="table border table-striped table-hover table-sm">
+ <thead>
<tr>
- <td class="text-break font-monospace px-2">
- <a href="{{ as_url(routes.keys.show_gpg_key,
fingerprint=key.fingerprint) }}">{{ key.fingerprint[:16]|upper }}</a>
- </td>
- <td class="text-break px-2">{{
email_from_key(key.primary_declared_uid) or 'Not specified' }}</td>
- <td class="text-break px-2">{{ key.apache_uid or "-" }}</td>
+ <th class="px-2" scope="col">Fingerprint</th>
+ <th class="px-2" scope="col">Email</th>
+ <th class="px-2" scope="col">Apache UID</th>
</tr>
- {% endfor %}
- </tbody>
- </table>
- </div>
- <form method="post"
- action="{{ as_url(routes.keys.update_committee_keys,
committee_name=committee.name) }}"
- class="mb-4 d-inline-block">
- {{ update_committee_keys_form.hidden_tag() }}
-
- {{ update_committee_keys_form.submit(class_='btn btn-sm
btn-outline-secondary') }}
- </form>
- {% else %}
- <p class="mb-4">No keys uploaded for this committee yet.</p>
+ </thead>
+ <tbody>
+ {% for key in committee.public_signing_keys %}
+ <tr>
+ <td class="text-break font-monospace px-2">
+ <a href="{{ as_url(routes.keys.show_gpg_key,
fingerprint=key.fingerprint) }}">{{ key.fingerprint[:16]|upper }}</a>
+ </td>
+ <td class="text-break px-2">{{
email_from_key(key.primary_declared_uid) or 'Not specified' }}</td>
+ <td class="text-break px-2">{{ key.apache_uid or "-" }}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ </div>
+ <form method="post"
+ action="{{ as_url(routes.keys.update_committee_keys,
committee_name=committee.name) }}"
+ class="mb-4 d-inline-block">
+ {{ update_committee_keys_form.hidden_tag() }}
+
+ {{ update_committee_keys_form.submit(class_='btn btn-sm
btn-outline-secondary') }}
+ </form>
+ {% else %}
+ <p class="mb-4">No keys uploaded for this committee yet.</p>
+ {% endif %}
{% endif %}
{% endfor %}
{% endblock content %}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
