From 851b9b3d2fbdff51c86c284dde2e43c4687e0e61 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Wed, 5 Oct 2016 15:14:33 +0000 Subject: [PATCH] Fixed a problem with the error message text for the nominee email edit form. - Legacy-Id: 12087 --- ietf/nomcom/forms.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ietf/nomcom/forms.py b/ietf/nomcom/forms.py index dfdc431b3..211097f6b 100644 --- a/ietf/nomcom/forms.py +++ b/ietf/nomcom/forms.py @@ -855,11 +855,14 @@ class EditNomineeForm(forms.ModelForm): if others.exists(): msg = ( "Changing email address for %s (#%s): There already exists a nominee " "with email address <%s>: %s -- please use the " - "Merge Nominee " + "Merge Nominee " "form instead." % ( self.instance.name(), - self.instance.pk, nominee_email, - (", ".join( "%s (#%s)" %( n.name(), n.pk) for n in others))) ) + self.instance.pk, + nominee_email, + (", ".join( "%s (#%s)" %( n.name(), n.pk) for n in others)), + reverse('ietf.nomcom.views.private_merge_nominee', kwargs={'year':self.instance.nomcom.year()}), + ) ) raise forms.ValidationError(mark_safe(msg)) return self.cleaned_data