Changeset 3cb9b1e
- Timestamp:
- Feb 8, 2013, 5:09:01 AM (13 years ago)
- Branches:
- master, space-access, stable, stage
- Children:
- 8d3b651
- Parents:
- afc5348
- git-author:
- Alex Dehnert <adehnert@…> (02/08/13 05:09:01)
- git-committer:
- Alex Dehnert <adehnert@…> (02/08/13 05:09:01)
- File:
-
- 1 edited
-
asadb/groups/views.py (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
asadb/groups/views.py
r8124413 r3cb9b1e 1097 1097 ) 1098 1098 1099 special_fields_choices = ( 1100 ('option_entry', '<option> entry', ), 1101 ) 1102 special_fields = forms.fields.MultipleChoiceField( 1103 choices=special_fields_choices, 1104 widget=forms.CheckboxSelectMultiple, 1105 required=False, 1106 ) 1107 1099 1108 _format_choices = [ 1100 1109 ('html/inline', "Web (HTML)", ), … … 1112 1121 ('fields', { 1113 1122 'legend': 'Data to display', 1114 'fields': ['basic_fields', 'people_fields', 'show_as_emails', ],1123 'fields': ['basic_fields', 'people_fields', 'show_as_emails', 'special_fields', ], 1115 1124 }), 1116 1125 ('final', { … … 1152 1161 escaped = html.escape(email) 1153 1162 return mark_safe("<a href='mailto:%s'>%s</a>" % (escaped, escaped)) 1163 1164 def format_option_entry(group): 1165 name = html.escape(group.name) 1166 return '<option value="%s">%s</option>' % (name, name, ) 1154 1167 1155 1168 reporting_html_formatters = { … … 1193 1206 col_labels.append(field.display_name) 1194 1207 1208 # Set up special fields 1209 special_formatters = [] 1210 if 'option_entry' in form.cleaned_data['special_fields']: 1211 col_labels.append('option_entry') 1212 special_formatters.append(format_option_entry) 1213 1195 1214 # Assemble data 1196 1215 if output_format == 'html': … … 1204 1223 val = formatters[field](val) 1205 1224 return val 1225 1206 1226 for group in qs: 1207 1227 group_data = [fetch_item(group, field) for field in basic_fields] … … 1210 1230 if show_as_emails: people = ["%s@mit.edu" % p for p in people] 1211 1231 group_data.append(", ".join(people)) 1232 1233 for formatter in special_formatters: 1234 group_data.append(formatter(group)) 1212 1235 1213 1236 report_groups.append(group_data)
Note: See TracChangeset
for help on using the changeset viewer.