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 7a70ce3 Update the form to delete releases
7a70ce3 is described below
commit 7a70ce306aabc237e3e5602bed8f98304e97408e
Author: Sean B. Palmer <[email protected]>
AuthorDate: Tue May 13 16:50:33 2025 +0100
Update the form to delete releases
---
atr/blueprints/admin/admin.py | 1 +
atr/blueprints/admin/templates/delete-release.html | 11 ++++-------
atr/templates/macros/forms.html | 8 ++++++--
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/atr/blueprints/admin/admin.py b/atr/blueprints/admin/admin.py
index 0e74a41..9a91437 100644
--- a/atr/blueprints/admin/admin.py
+++ b/atr/blueprints/admin/admin.py
@@ -52,6 +52,7 @@ class DeleteReleaseForm(util.QuartFormTyped):
wtforms.validators.InputRequired("Confirmation is required"),
wtforms.validators.Regexp("^DELETE$", message="Please type DELETE
to confirm"),
],
+ description="Please type DELETE exactly to confirm deletion.",
)
submit = wtforms.SubmitField("Delete selected releases permanently")
diff --git a/atr/blueprints/admin/templates/delete-release.html
b/atr/blueprints/admin/templates/delete-release.html
index 50ea957..8fe2e4a 100644
--- a/atr/blueprints/admin/templates/delete-release.html
+++ b/atr/blueprints/admin/templates/delete-release.html
@@ -41,13 +41,10 @@
</div>
<div class="mb-3">
- {{ form.confirm_delete.label(class="form-label") }}
- {{ form.confirm_delete(class="form-control" + (" is-invalid" if
form.confirm_delete.errors else "") , placeholder="DELETE") }}
- {% if form.confirm_delete.errors %}
- <div class="invalid-feedback">{{ form.confirm_delete.errors[0] }}</div>
- {% else %}
- <div class="form-text">Please type DELETE exactly to confirm
deletion.</div>
- {% endif %}
+ {{ forms.label(form.confirm_delete) }}
+ {{ forms.widget(form.confirm_delete, placeholder="DELETE") }}
+ {{ forms.errors(form.confirm_delete) }}
+ {{ forms.description(form.confirm_delete) }}
</div>
{{ form.submit(class="btn btn-danger") }}
diff --git a/atr/templates/macros/forms.html b/atr/templates/macros/forms.html
index e6d7583..17cae85 100644
--- a/atr/templates/macros/forms.html
+++ b/atr/templates/macros/forms.html
@@ -13,12 +13,16 @@
{% endif %}
{% endmacro %}
-{% macro widget(field, classes="form-control") %}
+{% macro widget(field, classes="form-control", placeholder=None) %}
{% set widget_class = classes %}
{% if field.errors %}
{% set widget_class = widget_class + ' is-invalid' %}
{% endif %}
- {{ field(class_=widget_class) }}
+ {% if placeholder is not none %}
+ {{ field(class_=widget_class, placeholder=placeholder) }}
+ {% else %}
+ {{ field(class_=widget_class) }}
+ {% endif %}
{% endmacro %}
{% macro errors(field, classes="invalid-feedback", item_separator="<br />") %}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
