From a6e3e518af72b804aeeaabc9688d7c39585ba445 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Tue, 19 Feb 2019 09:31:42 +0000
Subject: [PATCH] GH-858: make the form do more cleaning
---
opentech/apply/funds/forms.py | 9 +++++----
opentech/apply/funds/views.py | 5 ++---
.../static_src/src/javascript/apply/batch-actions.js | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opentech/apply/funds/forms.py b/opentech/apply/funds/forms.py
index e84c154bb..68df95604 100644
--- a/opentech/apply/funds/forms.py
+++ b/opentech/apply/funds/forms.py
@@ -208,12 +208,13 @@ class BatchUpdateReviewersForm(forms.Form):
queryset=User.objects.staff(),
widget=Select2MultiCheckboxesWidget(attrs={'data-placeholder': 'Staff'}),
)
- submission_ids = forms.CharField(widget=forms.HiddenInput())
+ submissions = forms.CharField(widget=forms.HiddenInput())
def __init__(self, *args, **kwargs):
kwargs.pop('user')
super().__init__(*args, **kwargs)
- def clean_submission_ids(self):
- value = self.cleaned_data['submission_ids']
- return [int(submission) for submission in value.split(',')]
+ def clean_submissions(self):
+ value = self.cleaned_data['submissions']
+ submission_ids = [int(submission) for submission in value.split(',')]
+ return ApplicationSubmission.objects.filter(id__in=submission_ids)
diff --git a/opentech/apply/funds/views.py b/opentech/apply/funds/views.py
index 8f1dd9e1c..c18493bd2 100644
--- a/opentech/apply/funds/views.py
+++ b/opentech/apply/funds/views.py
@@ -109,10 +109,9 @@ class BatchUpdateReviewersView(DelegatedViewMixin, FormView):
currently saved to that submission.
Send out a message of updates.
"""
- reviewers = User.objects.filter(id__in=form.cleaned_data['staff_reviewers'])
+ reviewers = form.cleaned_data['staff_reviewers']
- submission_ids = form.cleaned_data['submission_ids']
- submissions = ApplicationSubmission.objects.filter(id__in=submission_ids)
+ submissions = form.cleaned_data['submissions']
for submission in submissions:
submission.reviewers.add(*reviewers)
diff --git a/opentech/static_src/src/javascript/apply/batch-actions.js b/opentech/static_src/src/javascript/apply/batch-actions.js
index 05130ee6d..6729148a3 100644
--- a/opentech/static_src/src/javascript/apply/batch-actions.js
+++ b/opentech/static_src/src/javascript/apply/batch-actions.js
@@ -10,7 +10,7 @@
const $actionOptions = $('#id_action option');
const $batchTitlesList = $('.js-batch-titles');
const $batchTitleCount = $('.js-batch-title-count');
- const $hiddenIDlist = $('#id_submission_ids');
+ const $hiddenIDlist = $('#id_submissions');
const $toggleBatchList = $('.js-toggle-batch-list');
const activeClass = 'batch-actions-enabled';
const closedClass = 'is-closed';
--
GitLab