From 4145b4f0fbd256c2480187fa54e7674aab95bb17 Mon Sep 17 00:00:00 2001
From: bickelj <bickelj@gmail.com>
Date: Fri, 15 Mar 2024 06:02:05 -0500
Subject: [PATCH] Let non-Staff (e.g. Admin) do batch determination (#3796)
When an Admin who otherwise could make determinations on submissions
does a batch determination then it should succeed. This commit allows it
to succeed or throws a permissions error otherwise.
Issue #3793 Batch determination `KeyError` for non-Staff user
---
hypha/apply/determinations/forms.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/hypha/apply/determinations/forms.py b/hypha/apply/determinations/forms.py
index 1315c7d45..b9c553f4d 100644
--- a/hypha/apply/determinations/forms.py
+++ b/hypha/apply/determinations/forms.py
@@ -132,7 +132,8 @@ class BaseBatchDeterminationForm(BaseDeterminationForm, forms.Form):
widget=forms.ModelMultipleChoiceField.hidden_widget,
)
author = forms.ModelChoiceField(
- queryset=User.objects.staff(),
+ # Permissions should be handled by the view rather than the QuerySet here.
+ queryset=User.objects.active(),
widget=forms.ModelChoiceField.hidden_widget,
required=True,
)
@@ -569,7 +570,8 @@ class BatchDeterminationForm(StreamBaseForm, forms.Form, metaclass=FormMixedMeta
widget=forms.ModelMultipleChoiceField.hidden_widget,
)
author = forms.ModelChoiceField(
- queryset=User.objects.staff(),
+ # Permissions should be handled by the view rather than the QuerySet here.
+ queryset=User.objects.active(),
widget=forms.ModelChoiceField.hidden_widget,
required=True,
)
@@ -627,7 +629,8 @@ class BatchDeterminationForm(StreamBaseForm, forms.Form, metaclass=FormMixedMeta
def _post_clean(self):
submissions = self.cleaned_data["submissions"].undetermined()
data = {
- field: self.cleaned_data[field]
+ # If one of these keys is not set, we should get a validation error on the page rather than `KeyError`.
+ field: self.cleaned_data.get(field)
for field in ["author", "form_data", "outcome"]
}
--
GitLab