Skip to content

Commit 0a10e35

Browse files
Restedacdha
authored andcommitted
Add fix for django 1.10+, replacing aggregate_select with annotation_select
1 parent 6d7b22f commit 0a10e35

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

tabular_export/core.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ def get_field_names_from_queryset(qs):
4545
field_names = []
4646
field_names.extend(i.target.name for i in v_qs.query.select)
4747
field_names.extend(v_qs.query.extra_select.keys())
48-
field_names.extend(v_qs.query.aggregate_select.keys())
48+
try:
49+
# for django 1.10 and up (works starting in 1.8)
50+
field_names.extend(v_qs.query.annotation_select.keys())
51+
except AttributeError:
52+
field_names.extend(v_qs.query.aggregate_select.keys())
4953

5054
return field_names
5155

0 commit comments

Comments
 (0)