Skip to content

Commit e354d17

Browse files
committed
Fix several route reference bugs
1 parent 114217b commit e354d17

File tree

6 files changed

+27
-23
lines changed

6 files changed

+27
-23
lines changed

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,30 @@
1313

1414
This repository contains code developed by the **Apache Software Foundation (ASF) Tooling team**.
1515

16-
As of **October 2025**, this code is available for **internal ASF feedback only**.
16+
As of **October 2025**, this code is available for **internal ASF feedback only**.
1717
The project is in **alpha development** and subject to significant changes.
1818

19-
We welcome feedback and discussion, but note that many known issues and design refinements are already scheduled for future iterations.
19+
We welcome feedback and discussion, but note that many known issues and design refinements are already scheduled for future iterations.
2020
Please review our [issue tracker](https://github.com/apache/tooling-trusted-releases/issues) and inline comments before filing new issues.
2121

22-
The alpha test deployment is available at:
22+
The alpha test deployment is available at:
2323
🔗 <https://release-test.apache.org/>
2424

25-
> **Note:** This repository is not yet an officially maintained or endorsed ASF project.
26-
> It does not represent final technical or policy decisions for future ASF Tooling products.
25+
> **Note:** This repository is not yet an officially maintained or endorsed ASF project.
26+
> It does not represent final technical or policy decisions for future ASF Tooling products.
2727
> The code is provided without guarantees regarding stability, security, or backward compatibility.
2828
2929
## Getting Involved
3030

31-
Community feedback is encouraged!
31+
Community feedback is encouraged!
3232
If you are an ASF committer or contributor interested in Trusted Releases:
3333

3434
1. **Try it out** – The alpha test server allows you to experiment with the release process for your ASF project.
3535

36-
2. **Introduce yourself** on the development mailing list:
36+
2. **Introduce yourself** on the development mailing list:
3737
📧 [dev@tooling.apache.org](mailto:dev@tooling.apache.org)
3838

39-
3. **Share ideas or file issues:**
39+
3. **Share ideas or file issues:**
4040
Use the [GitHub Issues](https://github.com/apache/tooling-trusted-releases/issues) page to report bugs, suggest features, or discuss improvements.
4141

4242
## License
@@ -45,5 +45,5 @@ This project is licensed under the [Apache License, Version 2.0](LICENSE).
4545

4646
---
4747

48-
*Part of the [Apache Tooling Initiative](https://tooling.apache.org/).*
48+
*Part of the [Apache Tooling Initiative](https://tooling.apache.org/).*
4949
For more information about the ASF, visit [https://www.apache.org/](https://www.apache.org/).

atr/shared/finish.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ async def respond(
120120
if wants_json:
121121
return quart.jsonify(ok=ok, message=msg), http_status
122122
await quart.flash(msg, "success" if ok else "error")
123-
return await session.redirect(selected, project_name=project_name, version_name=version_name)
123+
return await session.redirect(get.finish.selected, project_name=project_name, version_name=version_name)
124124

125125
async with db.session() as data:
126126
release = await data.release(

atr/shared/projects.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import atr.db as db
2929
import atr.db.interaction as interaction
3030
import atr.forms as forms
31+
import atr.get as get
3132
import atr.log as log
3233
import atr.models.policy as policy
3334
import atr.models.sql as sql
@@ -271,7 +272,7 @@ async def view(session: web.Committer, name: str) -> response.Response | str:
271272
if "submit_metadata" in form_data:
272273
edited_metadata, metadata_form = await _metadata_edit(session, project, form_data)
273274
if edited_metadata is True:
274-
return quart.redirect(util.as_url(view, name=project.name))
275+
return quart.redirect(util.as_url(get.projects.view, name=project.name))
275276
elif "submit_policy" in form_data:
276277
policy_form = await ReleasePolicyForm.create_form(data=form_data)
277278
if await policy_form.validate_on_submit():
@@ -281,8 +282,10 @@ async def view(session: web.Committer, name: str) -> response.Response | str:
281282
try:
282283
await wacm.policy.edit(project, policy_data)
283284
except storage.AccessError as e:
284-
return await session.redirect(view, name=project.name, error=f"Error editing policy: {e}")
285-
return quart.redirect(util.as_url(view, name=project.name))
285+
return await session.redirect(
286+
get.projects.view, name=project.name, error=f"Error editing policy: {e}"
287+
)
288+
return quart.redirect(util.as_url(get.projects.view, name=project.name))
286289
else:
287290
log.info(f"policy_form.errors: {policy_form.errors}")
288291
else:
@@ -450,7 +453,7 @@ async def _policy_form_create(project: sql.Project) -> ReleasePolicyForm:
450453
async def _project_add(form: AddForm, session: web.Committer) -> response.Response:
451454
form_values = await _project_add_validate(form)
452455
if form_values is None:
453-
return quart.redirect(util.as_url(add_project, committee_name=form.committee_name.data))
456+
return quart.redirect(util.as_url(get.projects.add_project, committee_name=form.committee_name.data))
454457
committee_name, display_name, label = form_values
455458

456459
async with storage.write(session) as write:
@@ -459,9 +462,9 @@ async def _project_add(form: AddForm, session: web.Committer) -> response.Respon
459462
await wacm.project.create(committee_name, display_name, label)
460463
except storage.AccessError as e:
461464
await quart.flash(f"Error adding project: {e}", "error")
462-
return quart.redirect(util.as_url(add_project, committee_name=committee_name))
465+
return quart.redirect(util.as_url(get.projects.add_project, committee_name=committee_name))
463466

464-
return quart.redirect(util.as_url(view, name=label))
467+
return quart.redirect(util.as_url(get.projects.view, name=label))
465468

466469

467470
async def _project_add_validate(form: AddForm) -> tuple[str, str, str] | None:

atr/shared/start.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import atr.db as db
2424
import atr.db.interaction as interaction
2525
import atr.forms as forms
26-
import atr.get.compose as compose
26+
import atr.get as get
2727
import atr.models.sql as sql
2828
import atr.storage as storage
2929
import atr.template as template
@@ -65,7 +65,7 @@ async def selected(session: web.Committer, project_name: str) -> response.Respon
6565
new_release, _project = await wacp.release.start(project_name, version)
6666
# Redirect to the new draft's overview page on success
6767
return await session.redirect(
68-
compose.selected,
68+
get.compose.selected,
6969
project_name=project.name,
7070
version_name=new_release.version,
7171
success="Release candidate draft created successfully",

atr/shared/tokens.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
import atr.db as db
3333
import atr.forms as forms
34+
import atr.get as get
3435
import atr.htm as htm
3536
import atr.jwtoken as jwtoken
3637
import atr.log as log
@@ -255,7 +256,7 @@ async def _handle_add_token_post(
255256
htm.p(".mb-0")["Copy it now as you will not be able to see it again."],
256257
]
257258
await quart.flash(_as_markup(success_msg), "success")
258-
return await session.redirect(tokens)
259+
return await session.redirect(get.tokens.tokens)
259260

260261
return None
261262

@@ -268,7 +269,7 @@ async def _handle_delete_token_post(
268269
token_id_val = int(str(del_form.token_id.data))
269270
await _delete_token(session.uid, token_id_val)
270271
await quart.flash("Token deleted successfully", "success")
271-
return await session.redirect(tokens)
272+
return await session.redirect(get.tokens.tokens)
272273

273274
await quart.flash("Invalid delete request", "error")
274275
return None
@@ -288,6 +289,6 @@ async def _handle_issue_jwt_post(
288289
htm.p[htm.code(".bg-light.border.rounded.px-1.atr-word-wrap")[jwt_token],],
289290
]
290291
await quart.flash(_as_markup(success_msg), "success")
291-
return await session.redirect(tokens)
292+
return await session.redirect(get.tokens.tokens)
292293

293294
return None

atr/shared/upload.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import atr.db as db
2525
import atr.forms as forms
26-
import atr.get.compose as compose
26+
import atr.get as get
2727
import atr.log as log
2828
import atr.storage as storage
2929
import atr.template as template
@@ -77,7 +77,7 @@ async def selected(session: web.Committer, project_name: str, version_name: str)
7777
wacp = await write.as_project_committee_participant(project_name)
7878
number_of_files = await wacp.release.upload_files(project_name, version_name, file_name, file_data)
7979
return await session.redirect(
80-
compose.selected,
80+
get.compose.selected,
8181
success=f"{number_of_files} file{'' if number_of_files == 1 else 's'} added successfully",
8282
project_name=project_name,
8383
version_name=version_name,

0 commit comments

Comments
 (0)