Hopiu/django-modeltranslation
1
0
Fork 0
mirror of https://github.com/Hopiu/django-modeltranslation.git synced 2026-05-18 01:21:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix values_list + annotate combo bug (close #374).

Browse source
This commit is contained in:
Jacek Tomaszewski 2016-06-01 19:02:30 +02:00
parent f0503c2b2d
commit 2f227a45af
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modeltranslation/manager.py
View file

@ -525,7 +525,7 @@ else:
# Django >=1.8
fields += tuple(f for f in self.annotation_names if f not in fields)
for row in super(FallbackValuesListQuerySet, self).iterator():
if self.flat and len(fields) == 1:
if self.flat and len(self.original_fields) == 1:
yield row[fields[0]]
else:
yield tuple(row[f] for f in fields)

4
modeltranslation/tests/tests.py
View file

@ -2608,6 +2608,10 @@ class TestManager(ModeltranslationTestBase):
'description': None, 'description_en': None, 'description_de': None},
])
# annotation issue (#374)
self.assertEqual(list(manager.values_list('title', flat=True).annotate(Count('title'))),
['en'])
def test_values_list_annotation(self):
models.TestModel(title='foo').save()
models.TestModel(title='foo').save()