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: {{ form.sub_state_id }} "id_search_filename">Filename: {{ form.search_filename }}     {{ form.search_rfcnumber }} -    +    {{ form.search_area_acronym }}