Merge lp:~mhall119/summit/fix-old-icals into lp:summit

[Michael Hall]

Fixes ical generation for old summits

Old summits have a null value for meeting description, which is converted to a python None type. So even though the 'description' attribute existed, it's value was None, thus resulting in an exception being thrown in the ical generation when it tries to call .replace() on that None value

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py	2012-04-11 15:58:35 +0000
+++ summit/schedule/models/meetingmodel.py	2012-04-12 15:50:27 +0000
@@ -128,6 +128,9 @@
         super(Meeting, self).save()
         self.update_slug()
 
+    def get_decription(self):
+        return self.description or ''
+
     def share(self):
         if not self.pk or not self.private:
             return
 
=== modified file 'summit/schedule/render.py'
--- summit/schedule/render.py	2012-04-11 15:58:35 +0000
+++ summit/schedule/render.py	2012-04-12 15:50:27 +0000
@@ -1026,7 +1026,7 @@
 END:VEVENT
 ''' % {'id':meeting.id, 'dtstart':dtstart, 'dtend':dtend, 'category':categories,
        'eventname':meeting.title, 'eventplace': room.title, 'type': meeting.type,
-       'roomname':room.name, 'description': getattr(meeting, 'description', '').replace('\r', '').replace('\n', '\N'),
+       'roomname':room.name, 'description': meeting.get_decription().replace('\r', '').replace('\n', '\N'),
        'meeting_url':meeting.meeting_page_url,
        'base_url':getattr(settings, 'SITE_ROOT', 'http://summit.ubuntu.com')}
         ical += 'END:VCALENDAR'