Merge branch 'julian' of git://github.com/lapilofu/philo

[philo.git] / contrib / julian / feedgenerator.py

diff --git a/contrib/julian/feedgenerator.py b/contrib/julian/feedgenerator.py
index 274f617..19e959d 100644 (file)
--- a/contrib/julian/feedgenerator.py
+++ b/contrib/julian/feedgenerator.py
@@ -1,3 +1,4 @@
+from django.http import HttpResponse
 from django.utils.feedgenerator import SyndicationFeed
 import vobject
 
@@ -74,4 +75,10 @@ class ICalendarFeed(SyndicationFeed):
                                if key in ITEM_ICAL_MAP and val:
                                        event.add(ITEM_ICAL_MAP[key]).value = val
                
-               cal.serialize(outfile)
\ No newline at end of file
+               cal.serialize(outfile)
+               
+               # Some special handling for HttpResponses. See link above.
+               if isinstance(outfile, HttpResponse):
+                       filename = self.feed.get('filename', 'filename.ics')
+                       outfile['Filename'] = filename
+                       outfile['Content-Disposition'] = 'attachment; filename=%s' % filename
\ No newline at end of file