Merge pull request #2635 from AlanCoding/AS_test_pagination

Activity Stream update prefetched fields, avoid a .distinct().count()
This commit is contained in:
Alan Rominger
2016-06-27 10:29:10 -04:00
committed by GitHub
2 changed files with 10 additions and 14 deletions
+2 -2
View File
@@ -2619,7 +2619,7 @@ class ActivityStreamSerializer(BaseSerializer):
if not hasattr(obj, fk):
continue
allm2m = getattr(obj, fk).distinct()
if allm2m.count() > 0:
if getattr(obj, fk).exists():
rel[fk] = []
for thisItem in allm2m:
rel[fk].append(reverse('api:' + fk + '_detail', args=(thisItem.id,)))
@@ -2634,7 +2634,7 @@ class ActivityStreamSerializer(BaseSerializer):
if not hasattr(obj, fk):
continue
allm2m = getattr(obj, fk).distinct()
if allm2m.count() > 0:
if getattr(obj, fk).exists():
summary_fields[fk] = []
for thisItem in allm2m:
if fk == 'job':