@@ -586,8 +586,7 @@ class FeedbackForm(BaseNomcomForm, forms.ModelForm):
586586 widget = forms .TextInput (attrs = {'size' : '40' }))
587587 nominee_email = forms .CharField (label = 'nominee email' ,
588588 widget = forms .TextInput (attrs = {'size' : '40' }))
589- nominator_name = forms .CharField (label = 'your name' )
590- nominator_email = forms .CharField (label = 'your email' )
589+ nominator_email = forms .CharField (label = 'commenter email' )
591590
592591 comments = forms .CharField (label = 'Comments on this candidate' ,
593592 widget = forms .Textarea ())
@@ -612,25 +611,22 @@ def __init__(self, *args, **kwargs):
612611 fieldset = ['position_name' ,
613612 'nominee_name' ,
614613 'nominee_email' ,
615- 'nominator_name' ,
616614 'nominator_email' ,
617615 'comments' ]
618616
619617 if self .public :
620- readonly_fields += ['nominator_name' , ' nominator_email' ]
618+ readonly_fields += ['nominator_email' ]
621619 fieldset .append ('confirmation' )
622620 else :
623621 help_text = """(Nomcom Chair/Member: please fill this in. Use your own email address if the person making the
624622 comments wishes to be anonymous. The confirmation email will be sent to the address given here,
625623 and the address will also be captured as part of the registered nomination.)"""
626624 self .fields ['nominator_email' ].help_text = help_text
627- self .fields ['nominator_name' ].required = False
628625 self .fields ['nominator_email' ].required = False
629626
630627 author = get_user_email (self .user )
631628 if author :
632629 self .fields ['nominator_email' ].initial = author .address
633- self .fields ['nominator_name' ].initial = author .person .name
634630
635631 if self .position and self .nominee :
636632 self .fields ['position_name' ].initial = self .position .name
@@ -699,7 +695,6 @@ class Meta:
699695 fields = ('author' ,
700696 'nominee_name' ,
701697 'nominee_email' ,
702- 'nominator_name' ,
703698 'nominator_email' ,
704699 'confirmation' ,
705700 'comments' )
0 commit comments