From eb6341d82653dffc4403908e8d63680d3ae92783 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Thu, 25 Jan 2018 15:58:59 +0000 Subject: [PATCH] Removed the possibility of choosing '(None)' as reviewer from the bulk review request edit form; this prevents a crash on line 1474 of ietf/group/views.py, in manage_review_request(). The view code needs further care in order make it possible to unassign an assignment here. - Legacy-Id: 14570 --- ietf/group/forms.py | 2 +- ietf/review/utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ietf/group/forms.py b/ietf/group/forms.py index 023d2e0ab..dc05343b9 100644 --- a/ietf/group/forms.py +++ b/ietf/group/forms.py @@ -219,7 +219,7 @@ class ManageReviewRequestForm(forms.Form): action = forms.ChoiceField(choices=ACTIONS, widget=forms.HiddenInput, required=False) close = forms.ModelChoiceField(queryset=close_review_request_states(), required=False) - reviewer = PersonEmailChoiceField(empty_label="(None)", required=False, label_with="person") + reviewer = PersonEmailChoiceField(empty_label=None, required=False, label_with="person") add_skip = forms.BooleanField(required=False) def __init__(self, review_req, *args, **kwargs): diff --git a/ietf/review/utils.py b/ietf/review/utils.py index 407a5e23d..b61ed27ec 100644 --- a/ietf/review/utils.py +++ b/ietf/review/utils.py @@ -699,7 +699,7 @@ def setup_reviewer_field(field, review_req): field.initial = review_req.reviewer_id choices = make_assignment_choices(field.queryset, review_req) - if not field.required: + if not field.required and not field.empty_label is None: choices = [("", field.empty_label)] + choices field.choices = choices