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 49f9293 Improve the display of the release policy form
49f9293 is described below
commit 49f929351f8de98a51c3a15d4993715f63f349e7
Author: Sean B. Palmer <[email protected]>
AuthorDate: Thu May 29 17:04:38 2025 +0100
Improve the display of the release policy form
---
atr/routes/projects.py | 2 +-
atr/templates/macros/forms.html | 6 +++++-
atr/templates/project-view.html | 6 ++----
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/atr/routes/projects.py b/atr/routes/projects.py
index 5fbb9a1..2a9a332 100644
--- a/atr/routes/projects.py
+++ b/atr/routes/projects.py
@@ -78,7 +78,7 @@ class ReleasePolicyForm(util.QuartFormTyped):
" If 0, then wait until 3 +1 votes and more +1 than -1.",
)
manual_vote = wtforms.BooleanField(
- "Voting process",
+ "Manual voting process",
description="If this is set then the vote will be completely manual
and following policy is ignored.",
)
release_checklist = wtforms.StringField(
diff --git a/atr/templates/macros/forms.html b/atr/templates/macros/forms.html
index bf06a5b..c9551ce 100644
--- a/atr/templates/macros/forms.html
+++ b/atr/templates/macros/forms.html
@@ -33,7 +33,7 @@
{% endif %}
{% endmacro %}
-{% macro widget(field, classes="form-control", placeholder=None, rows=None,
autocomplete=None, id=None) %}
+{% macro widget(field, classes="form-control", placeholder=None, rows=None,
autocomplete=None, id=None, boolean_label=None) %}
{% set widget_class = classes %}
{% if field.errors %}
{% set widget_class = widget_class + ' is-invalid' %}
@@ -54,6 +54,10 @@
{% endif %}
{{ field(**render_args) }}
+
+ {% if (field.type == "BooleanField") and (boolean_label is not none) %}
+ <label class="form-check-label" for="{{ field.id }}">{{ boolean_label
}}</label>
+ {% endif %}
{% endmacro %}
{% macro errors(field, classes="invalid-feedback", item_separator="<br />") %}
diff --git a/atr/templates/project-view.html b/atr/templates/project-view.html
index 296f379..5f67b32 100644
--- a/atr/templates/project-view.html
+++ b/atr/templates/project-view.html
@@ -82,9 +82,8 @@
{{ forms.label(form.manual_vote, col="md3-high") }}
<div class="col-sm-8">
<div class="form-check">
- {{ forms.widget(form.manual_vote, classes="form-check-input")
}}
+ {{ forms.widget(form.manual_vote, classes="form-check-input",
boolean_label="Enable") }}
{{ forms.errors(form.manual_vote, classes="invalid-feedback
d-block") }}
- <label class="form-check-label" for="{{ form.manual_vote.id
}}">{{ form.manual_vote.label.text }}</label>
</div>
{{ forms.description(form.manual_vote) }}
</div>
@@ -130,9 +129,8 @@
{{ forms.label(form.pause_for_rm, col="md3-high") }}
<div class="col-sm-8">
<div class="form-check">
- {{ forms.widget(form.pause_for_rm, classes="form-check-input")
}}
+ {{ forms.widget(form.pause_for_rm, classes="form-check-input",
boolean_label="Enable") }}
{{ forms.errors(form.pause_for_rm, classes="invalid-feedback
d-block") }}
- <label class="form-check-label" for="{{ form.pause_for_rm.id
}}">{{ form.pause_for_rm.label.text }}</label>
</div>
{{ forms.description(form.pause_for_rm) }}
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
