From 514780a547864d3e992bca51e32c20235255c1d5 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Tue, 5 Jul 2022 08:51:33 +0200
Subject: [PATCH] Align the ordering of the filterns with the columns on
submission tables.
---
hypha/apply/funds/tables.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hypha/apply/funds/tables.py b/hypha/apply/funds/tables.py
index eafc06797..2e1fb5b5f 100644
--- a/hypha/apply/funds/tables.py
+++ b/hypha/apply/funds/tables.py
@@ -253,11 +253,11 @@ class StatusMultipleChoiceFilter(Select2MultipleChoiceFilter):
class SubmissionFilter(filters.FilterSet):
- round = Select2ModelMultipleChoiceFilter(queryset=get_used_rounds, label=_('Rounds'))
fund = Select2ModelMultipleChoiceFilter(field_name='page', queryset=get_used_funds, label=_('Funds'))
+ round = Select2ModelMultipleChoiceFilter(queryset=get_used_rounds, label=_('Rounds'))
lead = Select2ModelMultipleChoiceFilter(queryset=get_round_leads, label=_('Leads'))
- reviewers = Select2ModelMultipleChoiceFilter(queryset=get_reviewers, label=_('Reviewers'))
screening_statuses = Select2ModelMultipleChoiceFilter(queryset=get_screening_statuses, label=_('Screening'), null_label=_('No Status'))
+ reviewers = Select2ModelMultipleChoiceFilter(queryset=get_reviewers, label=_('Reviewers'))
category_options = Select2MultipleChoiceFilter(
choices=[], label=_('Category'),
method='filter_category_options'
@@ -266,7 +266,7 @@ class SubmissionFilter(filters.FilterSet):
class Meta:
model = ApplicationSubmission
- fields = ('fund', 'round', 'status')
+ fields = ('status', 'fund', 'round')
def __init__(self, *args, exclude=list(), limit_statuses=None, **kwargs):
super().__init__(*args, **kwargs)
--
GitLab