From 522af8f68391a11f6947e8db0b9f0de90de7e204 Mon Sep 17 00:00:00 2001 From: Fredrik Jonsson <frjo@xdeb.org> Date: Thu, 13 Jun 2024 10:54:11 +0200 Subject: [PATCH] Remove filters from tables on dashboards. (#3949) Fixes #3911 --- hypha/apply/dashboard/templates/dashboard/dashboard.html | 9 +++------ .../templates/dashboard/reviewer_dashboard.html | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/hypha/apply/dashboard/templates/dashboard/dashboard.html b/hypha/apply/dashboard/templates/dashboard/dashboard.html index f7dcbbdeb..4b5d0350e 100644 --- a/hypha/apply/dashboard/templates/dashboard/dashboard.html +++ b/hypha/apply/dashboard/templates/dashboard/dashboard.html @@ -91,14 +91,11 @@ {% if PROJECTS_ENABLED and projects.table.data %} <div id="active-projects" class="wrapper wrapper--bottom-space"> {% trans "Your projects" as project_heading %} - {% include "funds/includes/table_filter_and_search.html" with filter=projects.filterset filter_action=projects.url search_term=search_term search_action=projects.url search_placeholder="projects" use_search=True use_batch_actions=False heading="Your projects" %} {% render_table projects.table %} - {% if projects.display_more %} - <div class="all-submissions-table__more"> - <a href="{{ projects.url }}?lead={{ request.user.pk }}">{% trans "Show all" %}</a> - </div> - {% endif %} + <div class="all-submissions-table__more"> + <a href="{{ projects.url }}?lead={{ request.user.pk }}">{% trans "Show all" %}</a> + </div> </div> {% endif %} diff --git a/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html b/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html index 609bf9492..462fc2c47 100644 --- a/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html +++ b/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html @@ -30,14 +30,11 @@ <div class="wrapper wrapper--bottom-space"> {% trans "Your previous reviews" as review_heading %} - {% include "funds/includes/table_filter_and_search.html" with filter=my_reviewed.filterset filter_action=my_reviewed.url search_term=search_term search_action=my_reviewed.url use_search=True use_batch_actions=False heading=review_heading %} {% render_table my_reviewed.table %} - {% if my_reviewed.display_more %} - <div class="all-submissions-table__more"> - <a href="{{ my_reviewed.url }}?reviewers={{ request.user.pk }}">{% trans "Show all" %}</a> - </div> - {% endif %} + <div class="all-submissions-table__more"> + <a href="{{ my_reviewed.url }}?reviewers={{ request.user.pk }}">{% trans "Show all" %}</a> + </div> </div> {% endif %} -- GitLab