diff options
Diffstat (limited to 'webmentions_ssg')
| -rw-r--r-- | webmentions_ssg/templates/received.html | 49 | ||||
| -rw-r--r-- | webmentions_ssg/templates/sent.html | 24 | ||||
| -rw-r--r-- | webmentions_ssg/views/received.py | 4 | ||||
| -rw-r--r-- | webmentions_ssg/views/sources.py | 6 |
4 files changed, 30 insertions, 53 deletions
diff --git a/webmentions_ssg/templates/received.html b/webmentions_ssg/templates/received.html index 8931601..e7ec5a8 100644 --- a/webmentions_ssg/templates/received.html +++ b/webmentions_ssg/templates/received.html @@ -56,52 +56,27 @@ SPDX-License-Identifier: BSD-3-Clause method="get" class="row g-2 align-items-end mb-4" role="search"> - <input id="sort" name="sort" type="hidden" value="{{ sort_key }}"> - <input id="order" name="order" type="hidden" value="{{ sort_order }}"> + {{ filter_form.sort }} + {{ filter_form.order }} <div class="col-sm-6 col-lg"> - <label class="form-label" for="status">Status</label> - <select class="form-select" id="status" name="status"> - {% for value, label in status_choices.items() %} - <option value="{{ value }}" - {% if filters.get("status", "") == value %} selected{% endif %}>{{ label }}</option> - {% endfor %} - </select> + {{ filter_form.status.label(class_="form-label") }} + {{ filter_form.status(class_="form-select") }} </div> <div class="col-sm-6 col-lg"> - <label class="form-label" for="q">Source or target</label> - <input class="form-control" - id="q" - name="q" - type="search" - value="{{ filters.get('q', '') }}" - placeholder="Search URLs"> + {{ filter_form.q.label(class_="form-label") }} + {{ filter_form.q(class_="form-control", placeholder="Search URLs") }} </div> <div class="col-sm-6 col-lg"> - <label class="form-label" for="date_from">Updated from (UTC)</label> - <input class="form-control" - id="date_from" - name="date_from" - type="date" - value="{{ filters.get('date_from', '') }}"> + {{ filter_form.date_from.label(class_="form-label") }} + {{ filter_form.date_from(class_="form-control") }} </div> <div class="col-sm-6 col-lg"> - <label class="form-label" for="date_to">Updated to (UTC)</label> - <input class="form-control" - id="date_to" - name="date_to" - type="date" - value="{{ filters.get('date_to', '') }}"> + {{ filter_form.date_to.label(class_="form-label") }} + {{ filter_form.date_to(class_="form-control") }} </div> <div class="col-sm-6 col-lg-auto"> - <label class="form-label" for="per_page">Rows per page</label> - <input class="form-control" - id="per_page" - name="per_page" - type="number" - value="{{ page_size }}" - min="1" - max="{{ max_received_page_size }}" - step="1"> + {{ filter_form.per_page.label(class_="form-label") }} + {{ filter_form.per_page(class_="form-control", min=1, max=max_received_page_size, step=1) }} </div> <div class="col-auto d-flex gap-2 ms-auto"> <button type="submit" class="btn btn-primary">Filter</button> diff --git a/webmentions_ssg/templates/sent.html b/webmentions_ssg/templates/sent.html index 6febdb9..b613f4b 100644 --- a/webmentions_ssg/templates/sent.html +++ b/webmentions_ssg/templates/sent.html @@ -40,27 +40,27 @@ SPDX-License-Identifier: BSD-3-Clause method="get" class="row g-2 align-items-end mb-4" role="search"> - {{ form.sort }} - {{ form.order }} + {{ filter_form.sort }} + {{ filter_form.order }} <div class="col-sm-6 col-lg"> - {{ form.status.label(class_="form-label") }} - {{ form.status(class_="form-select") }} + {{ filter_form.status.label(class_="form-label") }} + {{ filter_form.status(class_="form-select") }} </div> <div class="col-sm-6 col-lg"> - {{ form.q.label(class_="form-label") }} - {{ form.q(class_="form-control", placeholder="Search paths and URLs") }} + {{ filter_form.q.label(class_="form-label") }} + {{ filter_form.q(class_="form-control", placeholder="Search paths and URLs") }} </div> <div class="col-sm-6 col-lg"> - {{ form.date_from.label(class_="form-label") }} - {{ form.date_from(class_="form-control") }} + {{ filter_form.date_from.label(class_="form-label") }} + {{ filter_form.date_from(class_="form-control") }} </div> <div class="col-sm-6 col-lg"> - {{ form.date_to.label(class_="form-label") }} - {{ form.date_to(class_="form-control") }} + {{ filter_form.date_to.label(class_="form-label") }} + {{ filter_form.date_to(class_="form-control") }} </div> <div class="col-sm-6 col-lg-auto"> - {{ form.per_page.label(class_="form-label") }} - {{ form.per_page(class_="form-control", min=1, max=max_source_page_size, step=1) }} + {{ filter_form.per_page.label(class_="form-label") }} + {{ filter_form.per_page(class_="form-control", min=1, max=max_source_page_size, step=1) }} </div> <div class="col-auto d-flex gap-2 ms-auto"> <button type="submit" class="btn btn-primary">Filter</button> diff --git a/webmentions_ssg/views/received.py b/webmentions_ssg/views/received.py index e49ee31..c273618 100644 --- a/webmentions_ssg/views/received.py +++ b/webmentions_ssg/views/received.py @@ -91,7 +91,8 @@ def received_list() -> ResponseReturnValue: :returns: Rendered page containing the paginated received Webmentions. """ - filters = received_filter_args(received_filter_form()) + filter_form = received_filter_form() + filters = received_filter_args(filter_form) query = sa.select(ReceivedWebmention) @@ -175,6 +176,7 @@ def received_list() -> ResponseReturnValue: page_size=page_size, sort_urls=sort_urls, max_received_page_size=current_app.config["RECEIVED_MAX_PAGE_SIZE"], + filter_form=filter_form, action_form=ConfirmActionForm(), ) diff --git a/webmentions_ssg/views/sources.py b/webmentions_ssg/views/sources.py index 84b98fb..a3dbb45 100644 --- a/webmentions_ssg/views/sources.py +++ b/webmentions_ssg/views/sources.py @@ -66,8 +66,8 @@ def source_filter_args(form: SourceFilterForm) -> SourceFilterArgs: @login_required def source_list() -> ResponseReturnValue: """Display source documents with filters for outgoing delivery problems.""" - form = source_filter_form() - filters = source_filter_args(form) + filter_form = source_filter_form() + filters = source_filter_args(filter_form) query = sa.select(SourceDocument).options( selectinload(SourceDocument.sent_webmentions) ) @@ -157,7 +157,6 @@ def source_list() -> ResponseReturnValue: "sent.html", title="Sent Webmentions", sources=sources, - form=form, filters=filters, sort_key=sort_key, sort_order=sort_order, @@ -165,6 +164,7 @@ def source_list() -> ResponseReturnValue: status_choices=SOURCE_STATUS_CHOICES, page_size=page_size, max_source_page_size=current_app.config["SOURCES_MAX_PAGE_SIZE"], + filter_form=filter_form, action_form=ConfirmActionForm(), ) |
