From f458cf94468cc78639a9ab341b7f9f2d68282fe7 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Wed, 11 Aug 2021 10:18:24 +0200
Subject: [PATCH] Always show submission filters. Remove the Filter button in
these cases.
---
hypha/apply/funds/templates/funds/base_submissions_table.html | 2 +-
.../templates/funds/includes/table_filter_and_search.html | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hypha/apply/funds/templates/funds/base_submissions_table.html b/hypha/apply/funds/templates/funds/base_submissions_table.html
index cbc14661e..75d3ae4a2 100644
--- a/hypha/apply/funds/templates/funds/base_submissions_table.html
+++ b/hypha/apply/funds/templates/funds/base_submissions_table.html
@@ -9,7 +9,7 @@
{% block content %}
{% block table %}
- {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action use_batch_actions=True %}
+ {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action use_batch_actions=True filter_classes="filters-open" %}
{% render_table table %}
{% endblock %}
diff --git a/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html b/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html
index 173124683..3fa73dcf5 100644
--- a/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html
+++ b/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html
@@ -47,7 +47,9 @@
{# Right #}
<div class="actions-bar__inner actions-bar__inner--right">
- <button class="button button--filters js-toggle-filters">Filters</button>
+ {% if filter_classes != 'filters-open' %}
+ <button class="button button--filters js-toggle-filters">Filters</button>
+ {% endif %}
{% if use_search|default:False %}
<form action="{{ search_action }}" method="get" role="search" class="form form--search-desktop">
--
GitLab