Merge lp:~daker/loco-team-portal/fix.1303773 into lp:loco-team-portal

Proposed by Adnane Belmadiaf
Status: Merged
Approved by: Michael Hall
Approved revision: 676
Merged at revision: 677
Proposed branch: lp:~daker/loco-team-portal/fix.1303773
Merge into: lp:loco-team-portal
Diff against target: 30 lines (+5/-4)
2 files modified
loco_directory/events/models.py (+3/-2)
loco_directory/teams/views.py (+2/-2)
To merge this branch: bzr merge lp:~daker/loco-team-portal/fix.1303773
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+214522@code.launchpad.net

Commit message

Fixed the ICS file

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/events/models.py'
2--- loco_directory/events/models.py 2013-10-25 23:03:37 +0000
3+++ loco_directory/events/models.py 2014-04-07 12:51:27 +0000
4@@ -118,8 +118,9 @@
5 event.add('description').value = u"%s" % self.description or ''
6 event.add('location').value = u"%s" % self.venue or ''
7 event.add('url').value = "http://loco.ubuntu.com%s" % self.get_absolute_url()
8- if self.venue:
9- event.add('geo').value = u"%s;%s" % (self.venue.latitude, self.venue.longitude)
10+ #FIXME : pad.lv/1303773
11+ #if self.venue:
12+ # event.add('geo').value = u"%s;%s" % (self.venue.latitude, self.venue.longitude)
13
14 def get_tz(self):
15 timezone = 'UTC'
16
17=== modified file 'loco_directory/teams/views.py'
18--- loco_directory/teams/views.py 2014-01-12 19:22:24 +0000
19+++ loco_directory/teams/views.py 2014-04-07 12:51:27 +0000
20@@ -108,8 +108,8 @@
21 calendar.add('x-wr-timezone').value = 'UTC'
22 calendar.add('x-wr-calname').value = name
23 calendar.add('x-wr-caldesc').value = name
24- for o in objects:
25- o.as_ical(calendar)
26+ for obj in objects:
27+ obj.as_ical(calendar)
28 response.write(calendar.serialize())
29
30 return response

Subscribers

People subscribed via source and target branches