Diff reduction: AD names are "Last, First" and "Area:" is "Area Acronym:".

fenner · fenner · commit c4cee402d57c · 2007-06-12T16:15:40.000Z
- Legacy-Id: 333
diff --git a/ietf/idtracker/forms.py b/ietf/idtracker/forms.py
@@ -12,7 +12,7 @@ class IDSearch(forms.Form):
     search_rfcnumber = forms.CharField(widget=forms.TextInput(attrs={'size': 5, 'maxlength': 60}))
     def __init__(self, *args, **kwargs):
         super(IDSearch, self).__init__(*args, **kwargs)
-	self.fields['search_job_owner'].choices = [('', '--All/Any')] + [(ad.id, str(ad)) for ad in IESGLogin.objects.filter(user_level=1).order_by('last_name')] + [('-99', '----------')] + [(ad.id, str(ad)) for ad in IESGLogin.objects.filter(user_level=2).order_by('last_name')]
+	self.fields['search_job_owner'].choices = [('', '--All/Any')] + [(ad.id, "%s, %s" % (ad.last_name, ad.first_name)) for ad in IESGLogin.objects.filter(user_level=1).order_by('last_name')] + [('-99', '----------')] + [(ad.id, "%s, %s" % (ad.last_name, ad.first_name)) for ad in IESGLogin.objects.filter(user_level=2).order_by('last_name')]
 
 class EmailFeedback(forms.Form):
     category = forms.CharField(widget=forms.HiddenInput())
diff --git a/ietf/templates/idtracker/idtracker_search.html b/ietf/templates/idtracker/idtracker_search.html
@@ -54,7 +54,7 @@ <h1>IETF I-D TRACKER</h1>
 "id_search_filename"><b>Filename:</b></label></td>
 <td>{{ form.search_filename }} &nbsp;&nbsp;&nbsp; <label for=
 "id_search_rfcnumber"><b>RFC Number:</b></label> {{ form.search_rfcnumber }}
-&nbsp;&nbsp;&nbsp; <label for="id_search_area_acronym"><b>Area:</b></label>
+&nbsp;&nbsp;&nbsp; <label for="id_search_area_acronym"><b>Area Acronym:</b></label>
 {{ form.search_area_acronym }}</td>
 </tr>
 
