Added extra check to avoid empty tags been sent in notifications.

[osqa.git] / forum / feed.py

diff --git a/forum/feed.py b/forum/feed.py
index 042f042ce650f1292e296bf84b0a506920f51137..c52e64bf8214b3df9b299cfa8b1d31c50cbf6c88 100644 (file)
--- a/forum/feed.py
+++ b/forum/feed.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 try:
     from django.contrib.syndication.views import Feed, FeedDoesNotExist, add_domain
     old_version = False
@@ -24,33 +26,33 @@ class BaseNodeFeed(Feed):
         description_template = "feeds/rss_description.html"
 
     def __init__(self, request, title, description, url):
-        self._title = title
-        self._description = mark_safe(description)
+        self._title = u"%s" % smart_unicode(title)
+        self._description = mark_safe(u"%s" % smart_unicode(description))
         self._url = url
 
         if old_version:
             super(BaseNodeFeed, self).__init__('', request)
 
     def title(self):
-        return self._title
+        return u"%s" % smart_unicode(self._title)
 
     def link(self):
         return self._url
 
     def description(self):
-        return self._description
+        return u"%s" % smart_unicode(self._description)
 
     def item_title(self, item):
-        return item.title
+        return u"%s" % smart_unicode(item.title)
 
     def item_description(self, item):
-        return item.html
+        return u"%s" % smart_unicode(item.html)
 
     def item_link(self, item):
         return item.leaf.get_absolute_url()
 
     def item_author_name(self, item):
-        return item.author.username
+        return u"%s" % smart_unicode(item.author.username)
 
     def item_author_link(self, item):
         return item.author.get_profile_url()
@@ -76,8 +78,11 @@ class RssQuestionFeed(BaseNodeFeed):
     def item_categories(self, item):
         return item.tagname_list()  
 
+    def _items(self):
+       return self._question_list
+
     def items(self):
-       return self._question_list[:30]
+        return self._items()[:30]
 
 class RssAnswerFeed(BaseNodeFeed):
     if old_version:
@@ -92,13 +97,16 @@ class RssAnswerFeed(BaseNodeFeed):
         self._question = question
         self._include_comments = include_comments
 
-    def items(self):
+    def _items(self):
         if self._include_comments:
             qs = self._question.all_children
         else:
             qs = self._question.answers
 
-        return qs.filter_state(deleted=False).order_by('-added_at')[:30]
+        return qs.filter_state(deleted=False).order_by('-added_at')
+
+    def items(self):
+        return self._items()[:30]
 
     def item_title(self, item):
         if item.node_type == "answer":