Summit

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

  1. fixes-994333
  2. Merge into trunk
Proposed by Michael Hall on 2012-05-04
Status: Merged
Approved by: Chris Johnston on 2012-05-04
Approved revision: 385
Merged at revision: 385
Proposed branch: lp:~mhall119/summit/fixes-994333
Merge into: lp:summit
Diff against target: 12 lines (+1/-1)
1 file modified
summit/schedule/views.py (+1/-1)
To merge this branch: bzr merge lp:~mhall119/summit/fixes-994333
Reviewer Review Type Date Requested Status
Chris Johnston 2012-05-04 Approve on 2012-05-04
Review via email: mp+104658@code.launchpad.net

Commit Message

Fix NoneType exception when attempting to view your created meetings when you aren't logged in

Description of the Change

Fix NoneType exception when attempting to view your created meetings when you aren't logged in

To post a comment you must log in.
Chris Johnston (cjohnston) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/schedule/views.py'
2--- summit/schedule/views.py 2012-05-03 01:57:41 +0000
3+++ summit/schedule/views.py 2012-05-04 01:19:17 +0000
4@@ -617,7 +617,7 @@
5 def created_meetings(request, summit, attendee, username):
6
7 drafter = get_object_or_404(Attendee, summit=summit, user__username=username)
8- if attendee.id != drafter.id:
9+ if attendee is None or attendee.id != drafter.id:
10 meetings = summit.meeting_set.filter(drafter=drafter).exclude(private=True)
11 else:
12 meetings = summit.meeting_set.filter(drafter=drafter)

Subscribers

People subscribed via source and target branches