Summit

Merge lp:~cjohnston/summit/meeting-type-changes into lp:summit

  1. meeting-type-changes
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 377
Merged at revision: 389
Proposed branch: lp:~cjohnston/summit/meeting-type-changes
Merge into: lp:summit
Diff against target: 47 lines (+8/-9)
2 files modified
summit/schedule/forms.py (+4/-4)
summit/schedule/models/meetingmodel.py (+4/-5)
To merge this branch: bzr merge lp:~cjohnston/summit/meeting-type-changes
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+104838@code.launchpad.net

Commit message

Changes some meeting types as well as reorg the create meeting form.

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

Approved as long as the datamigration gets approved too

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/schedule/forms.py'
2--- summit/schedule/forms.py 2012-04-11 15:58:35 +0000
3+++ summit/schedule/forms.py 2012-05-05 14:47:19 +0000
4@@ -103,14 +103,14 @@
5 class CreateMeeting(MeetingFormBase, RenderableMixin):
6 class Meta:
7 model = Meeting
8- fields = ('title', 'description', 'tracks', 'type', 'spec_url', 'wiki_url', 'pad_url',
9- 'requires_dial_in', 'private', 'slots', 'approved', 'video', 'override_break')
10+ fields = ('title', 'description', 'tracks', 'type', 'private', 'spec_url', 'wiki_url',
11+ 'pad_url', 'requires_dial_in', 'slots', 'approved', 'video', 'override_break')
12
13 class OrganizerEditMeeting(MeetingFormBase, RenderableMixin):
14 class Meta:
15 model = Meeting
16- fields = ('title', 'description', 'tracks', 'type', 'spec_url', 'wiki_url', 'pad_url',
17- 'requires_dial_in', 'private', 'slots', 'approved', 'video', 'override_break')
18+ fields = ('title', 'description', 'tracks', 'type', 'private', 'spec_url', 'wiki_url',
19+ 'pad_url', 'requires_dial_in', 'slots', 'approved', 'video', 'override_break')
20
21 class ProposeMeeting(MeetingFormBase, RenderableMixin):
22 class Meta:
23
24=== modified file 'summit/schedule/models/meetingmodel.py'
25--- summit/schedule/models/meetingmodel.py 2012-05-03 19:37:06 +0000
26+++ summit/schedule/models/meetingmodel.py 2012-05-05 14:47:19 +0000
27@@ -44,16 +44,15 @@
28 pass
29
30 TYPE_CHOICES = (
31- (u'blueprint', u'Blueprint'),
32- (u'roundtable', u'Roundtable'),
33+ (u'discussion', u'Discussion'),
34+ (u'boardroom', u'Boardroom'),
35 (u'plenary', u'Plenary'),
36- (u'talk', u'Plenary Talk'),
37- (u'bof', u'BoF'),
38+ (u'workshop', u'Workshop'),
39 (u'presentation', u'Presentation'),
40 (u'panel', u'Panel Discussion'),
41- (u'workshop', u'Workshop'),
42 (u'seminar', u'Seminar'),
43 (u'special', u'Special Event'),
44+ (u'bof', u'BoF'),
45 )
46
47 STATUS_CHOICES = (

Subscribers

People subscribed via source and target branches