Merge lp:~mhall119/summit/fixes-659285 into lp:summit

[Michael Hall]

Makes per-user ical feed available without login, but strips Private sessions from it.

[Dave Walker (davewalker)]

review: Approve

=== modified file 'summit/schedule/render.py'
--- summit/schedule/render.py	2010-10-12 21:50:55 +0000
+++ summit/schedule/render.py	2010-10-12 21:50:55 +0000
@@ -900,7 +900,10 @@
 
         return csv
 
-    def as_ical(self, only_username=None, only_room=None, only_track=None):
+    def as_ical(self, only_username=None, 
+                      only_room=None, 
+                      only_track=None, 
+                      show_private=True):
         """
         return a schedule as ical
         """
@@ -924,6 +927,8 @@
                         continue
                     if only_track is not None and meeting.tracks.filter(slug=only_track).count() == 0:
                         continue
+                    if not show_private and meeting.private:
+                        continue
                     dtstart = str(slot.start_utc).replace(' ','T', 1).replace(':','',2).replace('-','',2)
                     dtend = str(slot.end_utc).replace(' ','T', 1).replace(':','',2).replace('-','',2)
                     categories = ','.join([t.title for t in meeting.tracks.all()])

=== modified file 'summit/schedule/templates/schedule/summit.html'
--- summit/schedule/templates/schedule/summit.html	2010-10-12 21:50:55 +0000
+++ summit/schedule/templates/schedule/summit.html	2010-10-12 21:50:55 +0000
@@ -37,7 +37,7 @@
 
 <p><a href="/{{ summit.name }}/interest">Register your interest</a> in tracks and topics.</p>
 <p>Download your 
-<a href="/{{ summit.name }}/my_schedule.ical">Participation Schedule</a> to import into your Calendar.
+<a href="/{{ summit.name }}/participant/{{ attendee.user.username }}.ical">Participation Schedule</a> to import into your Calendar.
 </p>
 {% else %}
 {% if request.user.is_authenticated %}

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2010-10-12 21:50:55 +0000
+++ summit/schedule/views.py	2010-10-12 21:50:55 +0000
@@ -123,7 +123,7 @@
         'summit': summit,
         'attendee': attendee,
         'schedule': schedule,
-        'ical': '/%s/%s.ical' % (summit.name, room.name),
+        'ical': '/%s/room/%s.ical' % (summit.name, room.name),
         'autoreload': 'reload' in request.GET,
     }
     return render_to_response("schedule/schedule.html", context,
@@ -173,15 +173,15 @@
     return response
 
 @summit_only_required
-def my_ical(request, summit):
+def user_ical(request, summit, username):
     """Returns a user's registered events as an ical"""
     schedule = Schedule(request, summit)
     schedule.calculate()
     
-    filename = "my_%s.ical" % summit.name.replace(' ', '-').lower()
+    filename = "%s_%s.ical" % (summit.name, username)
     response = HttpResponse(mimetype='text/calendar')
-    response['Content-Disposition'] = 'attachment; filename=%s' % filename.encode('ascii', 'replace')
-    response.write(schedule.as_ical(only_username=request.user.username))
+    response['Content-Disposition'] = 'attachment; filename=%s' % filename.replace(' ', '-').lower().encode('ascii', 'replace')
+    response.write(schedule.as_ical(only_username=username, show_private=False))
     return response
     
 @summit_only_required
@@ -203,9 +203,8 @@
     schedule.calculate()
     
     filename = "%s_%s.ical" % (summit.name, track_slug)
-    response = HttpResponse(mimetype='text/pain')
-#    response = HttpResponse(mimetype='text/calendar')
-#    response['Content-Disposition'] = 'attachment; filename=%s' % filename.replace(' ', '-').lower().encode('ascii', 'replace')
+    response = HttpResponse(mimetype='text/calendar')
+    response['Content-Disposition'] = 'attachment; filename=%s' % filename.replace(' ', '-').lower().encode('ascii', 'replace')
     response.write(schedule.as_ical(only_track=track_slug))
     return response
     

=== modified file 'summit/urls.py'
--- summit/urls.py	2010-10-12 21:50:55 +0000
+++ summit/urls.py	2010-10-12 21:50:55 +0000
@@ -62,8 +62,8 @@
     (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[\w-]+)/$', 'by_track'),
     (r'^(?P<summit_name>[\w-]+)\.csv$', 'csv'),
     (r'^(?P<summit_name>[\w-]+)\.ical$', 'ical'),
-    (r'^(?P<summit_name>[\w-]+)/my_schedule\.ical$', 'my_ical'),
-    (r'^(?P<summit_name>[\w-]+)/(?P<room_name>[\w-]+).ical$', 'room_ical'),
+    (r'^(?P<summit_name>[\w-]+)/participant/(?P<username>[\w-]+)\.ical$', 'user_ical'),
+    (r'^(?P<summit_name>[\w-]+)/room/(?P<room_name>[\w-]+).ical$', 'room_ical'),
     (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[\w-]+).ical$', 'track_ical'),
 )