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 e23db64 Fix the admin page showing all releases
e23db64 is described below
commit e23db646ede57b2174f12ddc00d712ef5708b0cb
Author: Sean B. Palmer <[email protected]>
AuthorDate: Thu May 22 15:49:19 2025 +0100
Fix the admin page showing all releases
---
atr/blueprints/admin/admin.py | 7 ++++---
.../templates/{releases.html => all-releases.html} | 21 ++++-----------------
atr/templates/includes/sidebar.html | 4 ++--
docs/conventions.html | 2 +-
docs/conventions.md | 2 +-
5 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/atr/blueprints/admin/admin.py b/atr/blueprints/admin/admin.py
index bf40c98..99263ae 100644
--- a/atr/blueprints/admin/admin.py
+++ b/atr/blueprints/admin/admin.py
@@ -40,6 +40,7 @@ import atr.db as db
import atr.db.interaction as interaction
import atr.db.models as models
import atr.ldap as ldap
+import atr.routes.mapping as mapping
import atr.util as util
_LOGGER: Final = logging.getLogger(__name__)
@@ -288,12 +289,12 @@ async def admin_projects_update() -> str |
response.Response | tuple[Mapping[str
return await quart.render_template("update-projects.html",
empty_form=empty_form)
[email protected]("/releases")
-async def admin_releases() -> str:
[email protected]("/all-releases")
+async def admin_all_releases() -> str:
"""Display a list of all releases across all phases."""
async with db.session() as data:
releases = await data.release(_project=True,
_committee=True).order_by(models.Release.name).all()
- return await quart.render_template("releases.html", releases=releases)
+ return await quart.render_template("all-releases.html", releases=releases,
release_as_url=mapping.release_as_url)
@admin.BLUEPRINT.route("/tasks")
diff --git a/atr/blueprints/admin/templates/releases.html
b/atr/blueprints/admin/templates/all-releases.html
similarity index 67%
rename from atr/blueprints/admin/templates/releases.html
rename to atr/blueprints/admin/templates/all-releases.html
index 5541740..c196cfd 100644
--- a/atr/blueprints/admin/templates/releases.html
+++ b/atr/blueprints/admin/templates/all-releases.html
@@ -9,15 +9,14 @@
{% endblock description %}
{% block content %}
- <h2>All releases</h2>
+ <h1>All releases</h1>
<table class="table table-striped table-hover">
<thead>
<tr>
<th>Release name</th>
- <th>Project</th>
<th>Committee</th>
- <th>Stage</th>
+ <th>Project</th>
<th>Phase</th>
<th>Created</th>
</tr>
@@ -26,26 +25,14 @@
{% for release in releases %}
<tr>
<td>
- {% set phase_value = release.phase.value %}
{% if release.project %}
- {% if phase_value == "release_candidate_draft" %}
- <a href="{{ as_url(routes.draft.evaluate,
project_name=release.project.name, version_name=release.version) }}">{{
release.name }}</a>
- {% elif phase_value == "release_candidate" %}
- <a href="{{ as_url(routes.candidate.resolve) }}">{{
release.name }}</a>
- {% elif phase_value == "release_preview" %}
- <a href="{{ as_url(routes.preview.review) }}">{{ release.name
}}</a>
- {% elif phase_value == "release" %}
- <a href="{{ as_url(routes.release.review) }}">{{ release.name
}}</a>
- {% else %}
- {{ release.name }}
- {% endif %}
+ <a href="{{ release_as_url(release) }}">{{ release.name }}</a>
{% else %}
{{ release.name }}
{% endif %}
</td>
- <td>{{ release.project.name if release.project else "N/A" }}</td>
<td>{{ release.project.committee.name if release.project and
release.project.committee else "N/A" }}</td>
- <td>{{ release.stage.value }}</td>
+ <td>{{ release.project.name if release.project else "N/A" }}</td>
<td>
{% set phase_value = release.phase.value %}
{{ phase_value }} <br />
diff --git a/atr/templates/includes/sidebar.html
b/atr/templates/includes/sidebar.html
index 6c808d6..9b2fead 100644
--- a/atr/templates/includes/sidebar.html
+++ b/atr/templates/includes/sidebar.html
@@ -106,8 +106,8 @@
</li>
<li>
<i class="bi bi-list-ul"></i>
- <a href="{{ url_for('admin.admin_releases') }}"
- {% if request.endpoint == 'admin.admin_releases'
%}class="active"{% endif %}>All releases</a>
+ <a href="{{ url_for('admin.admin_all_releases') }}"
+ {% if request.endpoint == 'admin.admin_all_releases'
%}class="active"{% endif %}>All releases</a>
</li>
<li>
<i class="bi bi-arrow-repeat"></i>
diff --git a/docs/conventions.html b/docs/conventions.html
index fa576e8..5a229bf 100644
--- a/docs/conventions.html
+++ b/docs/conventions.html
@@ -126,7 +126,7 @@ def license_files_verify(): # sorted alphabetically
def example_02_prepare():
def example_03_query():
def example_04_filter():
-def example_05_process()):
+def example_05_process():
def example_06_clean_up():
</code></pre>
<h3>Give helper functions the same prefix as their parent function</h3>
diff --git a/docs/conventions.md b/docs/conventions.md
index b14c911..74dab3b 100644
--- a/docs/conventions.md
+++ b/docs/conventions.md
@@ -196,7 +196,7 @@ def example_01_start():
def example_02_prepare():
def example_03_query():
def example_04_filter():
-def example_05_process()):
+def example_05_process():
def example_06_clean_up():
```
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
