Briq
/
django-polymorphic
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Django < 1.8 compatibility

fix_request_path_info
Jonas Haag 2015-10-23 11:54:49 +02:00 committed by Hugo Osvaldo Barrera
parent 24e6b21204
commit 6cf187b2de
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
polymorphic/query.py
View File

@ -43,6 +43,14 @@ def transmogrify(cls, obj):
################################################################################### ###################################################################################
### PolymorphicQuerySet ### PolymorphicQuerySet
def _query_annotations(query):
try:
return query.annotations
except AttributeError:
# Django < 1.8
return query.aggregates
class PolymorphicQuerySet(QuerySet): class PolymorphicQuerySet(QuerySet):
""" """
QuerySet for PolymorphicModel QuerySet for PolymorphicModel
@ -239,8 +247,8 @@ class PolymorphicQuerySet(QuerySet):
if real_class != real_concrete_class: if real_class != real_concrete_class:
real_object = transmogrify(real_class, real_object) real_object = transmogrify(real_class, real_object)
if self.query.annotations: if _query_annotations(self.query):
for anno_field_name in six.iterkeys(self.query.annotations): for anno_field_name in six.iterkeys(_query_annotations(self.query)):
attr = getattr(base_result_objects_by_id[o_pk], anno_field_name) attr = getattr(base_result_objects_by_id[o_pk], anno_field_name)
setattr(real_object, anno_field_name, attr) setattr(real_object, anno_field_name, attr)
@ -255,8 +263,8 @@ class PolymorphicQuerySet(QuerySet):
resultlist = [results[ordered_id] for ordered_id in ordered_id_list if ordered_id in results] resultlist = [results[ordered_id] for ordered_id in ordered_id_list if ordered_id in results]
# set polymorphic_annotate_names in all objects (currently just used for debugging/printing) # set polymorphic_annotate_names in all objects (currently just used for debugging/printing)
if self.query.annotations: if _query_annotations(self.query):
annotate_names = list(six.iterkeys(self.query.annotations)) # get annotate field list annotate_names = list(six.iterkeys(_query_annotations(self.query))) # get annotate field list
for real_object in resultlist: for real_object in resultlist:
real_object.polymorphic_annotate_names = annotate_names real_object.polymorphic_annotate_names = annotate_names