Merge lp:~cjohnston/summit/admin-participants into lp:summit

Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 238
Merged at revision: 240
Proposed branch: lp:~cjohnston/summit/admin-participants
Merge into: lp:summit
Diff against target: 12 lines (+1/-1)
1 file modified
summit/schedule/admin/meetingadmin.py (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/summit/admin-participants
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+88103@code.launchpad.net

Commit message

Adds the ability for admins to add participants to a meeting

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

Looks good to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/schedule/admin/meetingadmin.py'
2--- summit/schedule/admin/meetingadmin.py 2011-12-09 18:21:47 +0000
3+++ summit/schedule/admin/meetingadmin.py 2012-01-10 19:23:26 +0000
4@@ -144,7 +144,7 @@
5 }),
6 )
7
8- #inlines = (ParticipantInline, )
9+ inlines = (ParticipantInline, )
10 form = MeetingAdminForm
11
12 admin.site.register(Meeting, MeetingAdmin)

Subscribers

People subscribed via source and target branches