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 8a9dba0 Make the resolution paths clearer
8a9dba0 is described below
commit 8a9dba0202fe649612205261b7c1ceefd6842661
Author: Sean B. Palmer <[email protected]>
AuthorDate: Mon Jun 30 20:12:19 2025 +0100
Make the resolution paths clearer
---
atr/routes/resolve.py | 5 ++++-
atr/routes/vote.py | 7 ++++---
atr/templates/check-selected-release-info.html | 2 +-
atr/templates/{vote-tabulate.html => vote-resolve.html} | 0
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/atr/routes/resolve.py b/atr/routes/resolve.py
index 177790b..a0fd266 100644
--- a/atr/routes/resolve.py
+++ b/atr/routes/resolve.py
@@ -79,7 +79,10 @@ async def selected_post(
if not resolve_form.validate_on_submit():
# TODO: Render the page again with errors
return await session.redirect(
- vote.tabulate, project_name=project_name,
version_name=version_name, error="Invalid form submission."
+ vote.selected_resolve,
+ project_name=project_name,
+ version_name=version_name,
+ error="Invalid form submission.",
)
email_body = util.unwrap(resolve_form.email_body.data)
vote_result = util.unwrap(resolve_form.vote_result.data)
diff --git a/atr/routes/vote.py b/atr/routes/vote.py
index 5742ba5..9d4fbc4 100644
--- a/atr/routes/vote.py
+++ b/atr/routes/vote.py
@@ -171,8 +171,9 @@ async def selected_post(session: routes.CommitterSession,
project_name: str, ver
)
[email protected]("/vote/<project_name>/<version_name>/tabulate",
methods=["POST"])
-async def tabulate(session: routes.CommitterSession, project_name: str,
version_name: str) -> str:
+# TODO: Improve this URL
[email protected]("/vote/<project_name>/<version_name>/resolve",
methods=["POST"])
+async def selected_resolve(session: routes.CommitterSession, project_name:
str, version_name: str) -> str:
"""Tabulate votes."""
await session.check_access(project_name)
asf_uid = session.uid
@@ -224,7 +225,7 @@ async def tabulate(session: routes.CommitterSession,
project_name: str, version_
)
resolve_form.vote_result.data = "passed" if passed else "failed"
return await template.render(
- "vote-tabulate.html",
+ "vote-resolve.html",
release=release,
tabulated_votes=tabulated_votes,
summary=summary,
diff --git a/atr/templates/check-selected-release-info.html
b/atr/templates/check-selected-release-info.html
index bf5a0a1..3095f18 100644
--- a/atr/templates/check-selected-release-info.html
+++ b/atr/templates/check-selected-release-info.html
@@ -69,7 +69,7 @@
class="btn btn-primary"><i class="bi bi-download me-1"></i>
Download files</a>
<a href="{{ as_url(routes.candidate.view,
project_name=release.project.name, version_name=release.version) }}"
class="btn btn-secondary"><i class="bi bi-eye me-1"></i> View
files</a>
- <form action="{{ as_url(routes.vote.tabulate,
project_name=release.project.name, version_name=release.version) }}"
+ <form action="{{ as_url(routes.vote.selected_resolve,
project_name=release.project.name, version_name=release.version) }}"
method="post"
class="mb-0">
{{ hidden_form.hidden_tag() }}
diff --git a/atr/templates/vote-tabulate.html b/atr/templates/vote-resolve.html
similarity index 100%
rename from atr/templates/vote-tabulate.html
rename to atr/templates/vote-resolve.html
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
