From c4cee402d57cf41495835e49a2df5315de38d61c Mon Sep 17 00:00:00 2001
From: Bill Fenner <fenner@fenron.net>
Date: Tue, 12 Jun 2007 16:15:40 +0000
Subject: [PATCH] Diff reduction: AD names are "Last, First" and "Area:" is
 "Area Acronym:".  - Legacy-Id: 333

---
 ietf/idtracker/forms.py                        | 2 +-
 ietf/templates/idtracker/idtracker_search.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ietf/idtracker/forms.py b/ietf/idtracker/forms.py
index 897a3eb4d..779caa6c0 100644
--- 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
index 34cb73852..69fe38aab 100644
--- a/ietf/templates/idtracker/idtracker_search.html
+++ b/ietf/templates/idtracker/idtracker_search.html
@@ -54,7 +54,7 @@ state</b>: {{ form.sub_state_id }}</label> </td>
 "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>