Merge lp:~ronnie.vd.c/loco-team-portal/623288 into lp:loco-team-portal

[Ronnie]

Calendar suppport is now trough the python-vobject library

[Chris Johnston (cjohnston)]

I get the following when clicking the iCal icon next to team events on the main page.

Traceback:
File "/usr/lib/pymodules/python2.6/django/core/handlers/base.py" in get_response
  100. response = callback(request, *callback_args, **callback_kwargs)
File "/home/chris/Dropbox/Projects/loco-directory/current/loco_directory/events/views.py" in teams_event_list_ical
  78. return event_list_ical(TeamEvent.objects.all(), 'All Ubuntu LoCo Team Events')
File "/home/chris/Dropbox/Projects/loco-directory/current/loco_directory/events/views.py" in event_list_ical
  55. response.write(calendar.serialize())
File "/usr/lib/pymodules/python2.6/vobject/base.py" in serialize
  186. return behavior.serialize(self, buf, lineLength, validate)
File "/usr/lib/pymodules/python2.6/vobject/behavior.py" in serialize
  157. out = base.defaultSerialize(transformed, buf, lineLength)
File "/usr/lib/pymodules/python2.6/vobject/base.py" in defaultSerialize
  947. child.serialize(outbuf, lineLength, validate=False)
File "/usr/lib/pymodules/python2.6/vobject/base.py" in serialize
  186. return behavior.serialize(self, buf, lineLength, validate)
File "/usr/lib/pymodules/python2.6/vobject/behavior.py" in serialize
  157. out = base.defaultSerialize(transformed, buf, lineLength)
File "/usr/lib/pymodules/python2.6/vobject/base.py" in defaultSerialize
  947. child.serialize(outbuf, lineLength, validate=False)
File "/usr/lib/pymodules/python2.6/vobject/base.py" in serialize
  186. return behavior.serialize(self, buf, lineLength, validate)
File "/usr/lib/pymodules/python2.6/vobject/behavior.py" in serialize
  157. out = base.defaultSerialize(transformed, buf, lineLength)
File "/usr/lib/pymodules/python2.6/vobject/base.py" in defaultSerialize
  953. if obj.behavior and not startedEncoded: obj.behavior.encode(obj)
File "/usr/lib/pymodules/python2.6/vobject/icalendar.py" in encode
  609. line.value = backslashEscape(line.value)
File "/usr/lib/pymodules/python2.6/vobject/base.py" in backslashEscape
  1137. s=s.replace("\\","\\\\").replace(";","\;").replace(",","\,")

Exception Type: AttributeError at /events/team/ical/
Exception Value: 'NoneType' object has no attribute 'replace'

review: Needs Fixing

[Adnane Belmadiaf (daker)]

I can't really reproduce it, i have tested all the links, and they all work for me.

review: Approve

[lp:~ronnie.vd.c/loco-team-portal/623288]

346. By Ronnie on 2011-01-09

Fixed NoneType error

[Chris Johnston (cjohnston)]

Confirmed not able to run. Also able to get Ronnie to reproduce the error.

review: Needs Fixing

[Adnane Belmadiaf (daker)]

Works fine for me!

review: Approve

=== modified file 'INSTALL'
--- INSTALL	2010-11-27 03:36:17 +0000
+++ INSTALL	2011-01-09 18:13:12 +0000
@@ -8,7 +8,7 @@
  - sudo -u postgres createdb -O postgres loco_directory
 
 Generally:
- - sudo apt-get install python-django python-launchpadlib libjs-jquery-ui python-django-openid-auth python-django-south iso-codes gettext python-tz
+ - sudo apt-get install python-django python-launchpadlib libjs-jquery-ui python-django-openid-auth python-django-south iso-codes gettext python-tz python-vobject
  - cd loco_directory
  - cp local_settings.py.sample local_settings.py
 # edit local_settings.py and set DATABASE_USER, DATABASE_PASSWORD, SECRET_KEY

=== modified file 'loco_directory/events/models.py'
--- loco_directory/events/models.py	2010-12-30 19:46:26 +0000
+++ loco_directory/events/models.py	2011-01-09 18:13:12 +0000
@@ -27,21 +27,17 @@
     def __unicode__(self):
         return self.name
     
-    def as_ical(self):
+    def as_ical(self, cal):
         """
         return a event as ical
         """
-        dtstart = str(self.date_begin).replace(' ','T', 1).replace(':','',2).replace('-','',2)
-        dtend = str(self.date_end).replace(' ','T', 1).replace(':','',2).replace('-','',2)
-        return '''BEGIN:VEVENT
-UID:%(id)s
-DTSTART:%(dtstart)sZ
-DTEND:%(dtend)sZ
-CATEGORIES:Ubuntu Loco Team Event
-SUMMARY:%(eventname)s
-DESCRIPTION:%(description)s
-END:VEVENT
-''' % {'id':self.id, 'dtstart':dtstart, 'dtend':dtend, 'eventname':self.name, 'description': self.description}
+        event = cal.add('vevent')
+        event.add('uid').value = str(self.id)
+        event.add('dtstart').value = self.date_begin
+        event.add('dtend').value = self.date_end
+        event.add('categories').value = ['Ubuntu Loco Team Event']
+        event.add('summary').value = self.name or ''
+        event.add('description').value = self.description or ''
 
     def is_past(self):
         return self.date_end > datetime.datetime.today()

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2011-01-05 16:01:17 +0000
+++ loco_directory/events/views.py	2011-01-09 18:13:12 +0000
@@ -21,6 +21,7 @@
 from common import launchpad
 
 import datetime
+import vobject
 
 def event_list(request):
     """
@@ -42,18 +43,17 @@
     filename = "%s.ics" % name.replace(' ', '-').lower()
     response = HttpResponse(mimetype='text/calendar')
     response['Content-Disposition'] = 'attachment; filename=%s' % filename.encode('ascii', 'replace')
-    response.write('''BEGIN:VCALENDAR
-PRODID:-//loco.ubuntu.com//EN
-VERSION:2.0
-CALSCALE:GREGORIAN
-METHOD:PUBLISH
-X-WR-TIMEZONE:UTC
-''')
-    response.write('X-WR-CALNAME:%s\n' % name)
-    response.write('X-WR-CALDESC:%s\n' % name)
+    calendar = vobject.iCalendar()
+    calendar.add('prodid').value = '-//loco.ubuntu.com//EN'
+    calendar.add('calscale').value = 'GREGORIAN'
+    calendar.add('method').value = 'PUBLISH'
+    calendar.add('x-wr-timezone').value = 'UTC'
+    calendar.add('x-wr-calname').value = name
+    calendar.add('x-wr-caldesc').value = name
     for event in events:
-        response.write(event.as_ical())
-    response.write('''END:VCALENDAR''')
+        event.as_ical(calendar)
+    response.write(calendar.serialize())
+    
     return response
 
 def event_ical(request, team_event_id):