Summit

Merge lp:~cjohnston/summit/vid-phone into lp:summit

  1. vid-phone
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 398
Merged at revision: 403
Proposed branch: lp:~cjohnston/summit/vid-phone
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/vid-phone
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+106004@code.launchpad.net

Commit message

Add video and phone to the meeting admin list

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

Looks good

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 2012-04-27 19:40:23 +0000
3+++ summit/schedule/admin/meetingadmin.py 2012-05-16 15:32:18 +0000
4@@ -132,7 +132,7 @@
5 share.short_description = "Share Meetings (Private only)"
6
7 class MeetingAdmin(admin.ModelAdmin):
8- list_display = ('summit', 'name', 'title', 'slots', 'override_break', 'private', 'type', 'approved')
9+ list_display = ('summit', 'name', 'title', 'slots', 'override_break', 'private', 'requires_dial_in', 'video', 'type', 'approved')
10 list_display_links = ('name', 'title')
11 list_filter = ('summit', 'type', 'tracks', 'slots', 'private',
12 'status', 'priority')

Subscribers

People subscribed via source and target branches