Finished with node bulk management, although only option for now is to delete nodes.

[osqa.git] / forum / feed.py

diff --git a/forum/feed.py b/forum/feed.py
index bbbf3e701d4975fd249eef2fabab538ffdcac003..d91fc22c4e1b7b0d251cf2e3105d71c416650af3 100644 (file)
--- a/forum/feed.py
+++ b/forum/feed.py
@@ -1,8 +1,8 @@
 try:
-    from django.contrib.syndication.views import Feed, FeedDoesNotExist
+    from django.contrib.syndication.views import Feed, FeedDoesNotExist, add_domain
     old_version = False
 except:
-    from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
+    from django.contrib.syndication.feeds import Feed, FeedDoesNotExist, add_domain
     old_version = True
 
 from django.http import HttpResponse
@@ -10,6 +10,11 @@ from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from models import Question
 from forum import settings
+from forum.modules import decorate
+
+@decorate(add_domain, needs_origin=False)
+def add_domain(domain, url):
+    return "%s%s" % (settings.APP_URL, url)
 
 class BaseNodeFeed(Feed):
     if old_version:
@@ -18,7 +23,7 @@ class BaseNodeFeed(Feed):
 
     def __init__(self, request, title, description, url):
         self._title = title
-        self._description = mark_safe(description)
+        self._description = mark_safe(unicode(description))
         self._url = url
 
         if old_version: