Ticket #2158: syndication.diff

syndication/views.py

@@ -1 +1 @@
 from django.contrib.syndication import feeds
 from django.http import HttpResponse, Http404
 
-def feed(request, url, feed_dict=None):
+def feed(request, url, feed_dict=None, description_template=None, title_template=None):
     if not feed_dict:
         raise Http404, "No feeds are registered."
 
@@ -15 +15 @@
     except KeyError:
         raise Http404, "Slug %r isn't registered." % slug
 
+    desc = description_template
+    title = title_template
+
     try:
-        feedgen = f(slug, request.path).get_feed(param)
+        feedgen = f(slug, request.path).get_feed(param, desc, title)
     except feeds.FeedDoesNotExist:
         raise Http404, "Invalid feed parameters. Slug %r is valid, but other parameters, or lack thereof, are not." % slug
 

syndication/feeds.py

@@ -47 +47 @@
                 return attr()
         return attr
 
-    def get_feed(self, url=None):
+    def get_feed(self, url=None, desc_temp=None, title_temp=None):
         """
         Returns a feedgenerator.DefaultFeed object, fully populated, for
         this feed. Raises FeedDoesNotExist for invalid parameters.
@@ -76 +76 @@
         )
 
         try:
-            title_template = loader.get_template('feeds/%s_title.html' % self.slug)
+                        if title_temp:
+                                title_template = loader.get_template(title_temp)
+                        else:
+                                title_template = loader.get_template('feeds/%s_title.html' % self.slug)
         except TemplateDoesNotExist:
             title_template = Template('{{ obj }}')
         try:
-            description_template = loader.get_template('feeds/%s_description.html' % self.slug)
+                        if desc_temp:
+                                description_template = loader.get_template(desc_temp)
+                        else:
+                                description_template = loader.get_template('feeds/%s_description.html' % self.slug)
         except TemplateDoesNotExist:
             description_template = Template('{{ obj }}')