From 97b87024e0d01c72441d6240ee07eeacef091369 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Sun, 24 Sep 2017 20:39:20 +0200
Subject: [PATCH] Minor tweaks of pool filter
---
submissions/forms.py | 9 +++++++--
submissions/templates/submissions/pool/pool.html | 2 +-
submissions/views.py | 3 ++-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/submissions/forms.py b/submissions/forms.py
index 7cf9c9c1d..37f07e08e 100644
--- a/submissions/forms.py
+++ b/submissions/forms.py
@@ -45,11 +45,16 @@ class SubmissionSearchForm(forms.Form):
class SubmissionPoolFilterForm(forms.Form):
status = forms.ChoiceField(choices=((None, 'All statuses'),) + SUBMISSION_STATUS,
required=False)
+ editor_in_charge = forms.BooleanField(label='Show only Submissions for which I am editor in charge.', required=False)
- def search(self, queryset):
+ def search(self, queryset, current_contributor=None):
if self.cleaned_data.get('status'):
# Do extra check on non-required field to never show errors on template
- return queryset.filter(status=self.cleaned_data['status'])
+ queryset = queryset.filter(status=self.cleaned_data['status'])
+
+ if self.cleaned_data.get('editor_in_charge') and current_contributor:
+ queryset = queryset.filter(editor_in_charge=current_contributor)
+
return queryset
diff --git a/submissions/templates/submissions/pool/pool.html b/submissions/templates/submissions/pool/pool.html
index 3ecb76148..2d852931e 100644
--- a/submissions/templates/submissions/pool/pool.html
+++ b/submissions/templates/submissions/pool/pool.html
@@ -56,7 +56,7 @@
{% if search_form %}
<h3>Filter by status</h3>
<form method="get" class="auto-submit mb-3">
- {{ search_form|bootstrap_inline }}
+ {{ search_form|bootstrap:'12,12' }}
</form>
{% endif %}
diff --git a/submissions/views.py b/submissions/views.py
index efc47b44b..9d9fafc72 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -369,7 +369,8 @@ def pool(request, arxiv_identifier_w_vn_nr=None):
# Search
search_form = SubmissionPoolFilterForm(request.GET or None)
if search_form.is_valid():
- context['submissions_in_pool'] = search_form.search(context['submissions_in_pool'])
+ context['submissions_in_pool'] = search_form.search(context['submissions_in_pool'],
+ request.user.contributor)
context['search_form'] = search_form
# Show specific submission in the pool
--
GitLab