From 96994a3ba3a248fe9a40cf717c46eeaf38254b79 Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Sun, 2 Sep 2018 19:33:24 +0200 Subject: [PATCH] More merge failure cleanups --- postgresqleu/newsevents/feeds.py | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/postgresqleu/newsevents/feeds.py b/postgresqleu/newsevents/feeds.py index 00e24a7..afbccc4 100644 --- a/postgresqleu/newsevents/feeds.py +++ b/postgresqleu/newsevents/feeds.py @@ -1,7 +1,7 @@ from django.contrib.syndication.views import Feed from django.conf import settings -from models import News, Event +from models import News import datetime @@ -17,19 +17,3 @@ class LatestNews(Feed): def item_link(self, news): return "%s/news/%s" % (settings.SITEBASE, news.id) -class LatestEvents(Feed): - title = "Events - %s" % settings.ORG_NAME - link = "%s/events/" % settings.SITEBASE - description = "The latest events from %s" % settings.ORG_NAME - description_template = "pieces/event_description.html" - - def items(self): - return Event.objects.filter(startdate__gte=datetime.datetime.today())[:10] - - def item_link(self, event): - return "%s/events/%s" % (settings.SITEBASE, event.id) - - def item_pubdate(self, event): - # RSS feed needs a datetime object, not a date object - return datetime.datetime.fromordinal(event.startdate.toordinal()) - -- 2.39.5