Update for newer django

[sommitrealweird.git] / sommitrealweird / blog / feeds.py

diff --git a/sommitrealweird/blog/feeds.py b/sommitrealweird/blog/feeds.py
index 8242cfea56a3b2dd2adb47e997492f59ccb3dc0e..991d2f0c7271dd3fa3893b798e76357bad144705 100644 (file)
--- a/sommitrealweird/blog/feeds.py
+++ b/sommitrealweird/blog/feeds.py
@@ -1,4 +1,4 @@
-from django.contrib.syndication.feeds import Feed
+from django.contrib.syndication.views import Feed

 from django.utils.feedgenerator import Atom1Feed
 from blog.models import BlogEntry
 from django.conf import settings
 from django.utils.feedgenerator import Atom1Feed
 from blog.models import BlogEntry
 from django.conf import settings


@@ -13,9 +13,9 @@ class LatestBlogEntriesRss(Feed):
 
     def items(self):
         try:
 
     def items(self):
         try:

-            return BlogEntry.objects.all().order_by('-publish_date')[:20]
+            return BlogEntry.objects.filter(islive=True).order_by('-publish_date')[:20]

         except:
         except:

-            return BlogEntry.objects.all().order_by('-publish_date')
+            return BlogEntry.objects.filter(islive=True).order_by('-publish_date')

 
     def author_name(self, obj):
         return "Brett Parker"
 
     def author_name(self, obj):
         return "Brett Parker"


@@ -23,6 +23,12 @@ class LatestBlogEntriesRss(Feed):
     def author_email(self, obj):
         return "iDunno@sommitrealweird.co.uk"
 
     def author_email(self, obj):
         return "iDunno@sommitrealweird.co.uk"
 

+    def item_author_name(self, obj):
+        return "Brett Parker"
+
+    def item_author_email(self, obj):
+        return "iDunno@sommitrealweird.co.uk"
+

     def item_pubdate(self, obj):
         return obj.publish_date
 
     def item_pubdate(self, obj):
         return obj.publish_date