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

- Legacy-Id: 333
This commit is contained in:
Bill Fenner 2007-06-12 16:15:40 +00:00
parent 6acb406762
commit c4cee402d5
2 changed files with 2 additions and 2 deletions

View file

@ -12,7 +12,7 @@ class IDSearch(forms.Form):
search_rfcnumber = forms.CharField(widget=forms.TextInput(attrs={'size': 5, 'maxlength': 60})) search_rfcnumber = forms.CharField(widget=forms.TextInput(attrs={'size': 5, 'maxlength': 60}))
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(IDSearch, self).__init__(*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): class EmailFeedback(forms.Form):
category = forms.CharField(widget=forms.HiddenInput()) category = forms.CharField(widget=forms.HiddenInput())

View file

@ -54,7 +54,7 @@ state</b>: {{ form.sub_state_id }}</label> </td>
"id_search_filename"><b>Filename:</b></label></td> "id_search_filename"><b>Filename:</b></label></td>
<td>{{ form.search_filename }} &nbsp;&nbsp;&nbsp; <label for= <td>{{ form.search_filename }} &nbsp;&nbsp;&nbsp; <label for=
"id_search_rfcnumber"><b>RFC Number:</b></label> {{ form.search_rfcnumber }} "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> {{ form.search_area_acronym }}</td>
</tr> </tr>