summaryrefslogtreecommitdiff
path: root/chimere/rss/feeds.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2010-11-22 16:10:38 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2010-11-22 16:10:38 +0100
commit611a649f3dcd26b04b6c1f9f7eb4984075ab411c (patch)
treeb48969b8af754957ecb95f76846fdfb26fb1a496 /chimere/rss/feeds.py
parentb0ddd6c8e2db7c33ba8c416440d1fec7a73f393c (diff)
parent567c5d60cb4e7364c16fedf07983eecd02c05ac4 (diff)
downloadChimère-611a649f3dcd26b04b6c1f9f7eb4984075ab411c.tar.bz2
Chimère-611a649f3dcd26b04b6c1f9f7eb4984075ab411c.zip
Merge branch 'master' into carte-ouverte
Diffstat (limited to 'chimere/rss/feeds.py')
-rw-r--r--chimere/rss/feeds.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/chimere/rss/feeds.py b/chimere/rss/feeds.py
index 1bb1a76..01a574e 100644
--- a/chimere/rss/feeds.py
+++ b/chimere/rss/feeds.py
@@ -77,20 +77,14 @@ class LatestPOIsByCategory(BaseFeed):
raise FeedDoesNotExist
return settings.BASE_URL + 'rss/category/' + str(obj.id)
- def description(self, obj):
- """
- Description of the feed
- """
- return obj.description
-
def items(self, obj):
"""
Requests to marker where its category match the category is requested
and its status is available
- This returns a list of the 15 last markers/POIs ordering by date
+ This returns a list of the 15 last markers/POIs ordering by date
"""
q = Marker.objects.filter(status__exact='A',
- categories__subcategory__category__id__exact=obj.id,
+ categories__category__id__exact=obj.id,
available_date__isnull=False).order_by('-available_date')[:15]
return q