This is an automated email from the ASF dual-hosted git repository.
tn 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 711cbd0 change order of fields when adding files to a draft, improve
help text
711cbd0 is described below
commit 711cbd0680841f7e0eb9b4b71e9f122be927c1fe
Author: Thomas Neidhart <[email protected]>
AuthorDate: Tue Apr 1 11:06:37 2025 +0200
change order of fields when adding files to a draft, improve help text
---
atr/routes/draft.py | 2 +-
atr/templates/draft-add-files.html | 24 ++++++++++++------------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/atr/routes/draft.py b/atr/routes/draft.py
index f33e0f7..79f09f7 100644
--- a/atr/routes/draft.py
+++ b/atr/routes/draft.py
@@ -227,7 +227,7 @@ async def add_file(session: routes.CommitterSession,
project_name: str, version_
file_name = wtforms.StringField("File name (optional)")
file_data = wtforms.MultipleFileField(
- "File", validators=[wtforms.validators.InputRequired("File(s) are
required")]
+ "File(s)", validators=[wtforms.validators.InputRequired("File(s)
are required")]
)
submit = wtforms.SubmitField("Add file(s)")
diff --git a/atr/templates/draft-add-files.html
b/atr/templates/draft-add-files.html
index 35cd317..39923a7 100644
--- a/atr/templates/draft-add-files.html
+++ b/atr/templates/draft-add-files.html
@@ -19,18 +19,6 @@
class="striking py-4 px-5 needs-validation"
novalidate>
{{ form.csrf_token }}
- <div class="mb-3 pb-3 row border-bottom">
- <label for="{{ form.file_name.id }}"
- class="col-sm-3 col-form-label text-sm-end">{{
form.file_name.label.text }}:</label>
- <div class="col-sm-8">
- {{ form.file_name(class_="form-control" + (" is-invalid" if
form.file_name.errors else "") ) }}
- <span id="file_path-help" class="form-text text-muted">Enter the path
where the file should be saved in the release candidate</span>
- {% if form.file_name.errors %}
- {% for error in form.file_name.errors %}<div
class="invalid-feedback">{{ error }}</div>{% endfor %}
- {% endif %}
- </div>
- </div>
-
<div class="mb-3 pb-3 row border-bottom">
<label for="{{ form.file_data.id }}"
class="col-sm-3 col-form-label text-sm-end">{{
form.file_data.label.text }}:</label>
@@ -43,6 +31,18 @@
</div>
</div>
+ <div class="mb-3 pb-3 row border-bottom">
+ <label for="{{ form.file_name.id }}"
+ class="col-sm-3 col-form-label text-sm-end">{{
form.file_name.label.text }}:</label>
+ <div class="col-sm-8">
+ {{ form.file_name(class_="form-control" + (" is-invalid" if
form.file_name.errors else "") ) }}
+ <span id="file_path-help" class="form-text text-muted">Enter a file
name to use when saving the file in the release candidate, only available when
uploading a single file</span>
+ {% if form.file_name.errors %}
+ {% for error in form.file_name.errors %}<div
class="invalid-feedback">{{ error }}</div>{% endfor %}
+ {% endif %}
+ </div>
+ </div>
+
<div class="row">
<div class="col-sm-9 offset-sm-3">{{ form.submit(class_="btn btn-primary
mt-3") }}</div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
