Skip to content

fix: Use identifier for export instead of field identifier #7484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 3, 2020
Merged

fix: Use identifier for export instead of field identifier #7484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/api/helpers/csv_jobs_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ def export_attendees_csv(attendees, custom_forms):
if field.is_complex:
fields_dict = attendee.complex_field_values
column.append(
fields_dict.get(field.field_identifier, '') if fields_dict else ''
fields_dict.get(field.identifier, '') if fields_dict else ''
)
else:
column.append(getattr(attendee, field.field_identifier, ''))
column.append(getattr(attendee, field.identifier, ''))

rows.append(column)

Expand Down
4 changes: 2 additions & 2 deletions app/templates/pdf/attendees_pdf.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ <h3 style="text-align:center;">{{ holders[0].event.name }} - {{ ("Attendees List
<td><br>
{% for field in custom_forms %}
{% if field.is_complex and holder.complex_field_values %}
{{ holder.complex_field_values[field.field_identifier] }} <br>
{{ holder.complex_field_values[field.identifier] }} <br>
{% else %}
{{ holder | attr(field.field_identifier) }} <br>
{{ holder | attr(field.identifier) }} <br>
{% endif %}
{% endfor %}
{% if holder.ticket.price %}
Expand Down