From a5d90cfbcd74648750e695c68fac6e7c4e933f45 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 26 Oct 2012 17:51:13 +0200 Subject: Feeds: Fix feeds by area (refs #378) --- chimere/feeds.py | 7 ++----- chimere/tests.py | 5 +++++ 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'chimere') diff --git a/chimere/feeds.py b/chimere/feeds.py index 100dd6b..53444ac 100644 --- a/chimere/feeds.py +++ b/chimere/feeds.py @@ -220,9 +220,6 @@ class LatestPOIsByZoneID(BaseFeed): return reverse('chimere:feeds-areaid', args=['', obj.id]) def items(self, obj): - sql = 'select * from "chimere_marker" where ' + obj.getIncludeSql() - sql += ' and "chimere_marker".available_date is not null' - sql += ' and "chimere_marker".status=\'A\'' - sql += ' order by "chimere_marker".available_date desc limit 15' - q = Marker.objects.raw(sql) + q = Marker.objects.filter(available_date__isnull=False, status='A') + q = q.filter(obj.getIncludeMarker()).order_by('-available_date')[:15] return q diff --git a/chimere/tests.py b/chimere/tests.py index ddd59b1..6417a4f 100644 --- a/chimere/tests.py +++ b/chimere/tests.py @@ -173,4 +173,9 @@ class FeedsTest(TestCase): self.assertEqual(200, response.status_code) doc = lxml.etree.fromstring(response.content) self.assertEqual(int(doc.xpath('count(//item)')), len(self.markers)) + url = reverse('chimere:feeds-areaid', args=('', 1)) + response = self.client.get(url) + self.assertEqual(200, response.status_code) + doc = lxml.etree.fromstring(response.content) + self.assertEqual(int(doc.xpath('count(//item)')), 2) -- cgit v1.2.3