Merge lp:~mhall119/summit/new-meeting-stuff into lp:~cjohnston/summit/new-meeting-stuff

Proposed by Michael Hall
Status: Needs review
Proposed branch: lp:~mhall119/summit/new-meeting-stuff
Merge into: lp:~cjohnston/summit/new-meeting-stuff
Diff against target: 432 lines (+208/-204)
3 files modified
summit/schedule/migrations/0017_add_review_status.py (+0/-204)
summit/schedule/migrations/0018_add_review_status.py (+205/-0)
summit/schedule/models/meetingmodel.py (+3/-0)
To merge this branch: bzr merge lp:~mhall119/summit/new-meeting-stuff
Reviewer Review Type Date Requested Status
Chris Johnston Pending
Review via email: mp+98116@code.launchpad.net

Description of the change

Update migration to new sequence number.
Default Launchpad imported meetings to APPROVED

To post a comment you must log in.

Unmerged revisions

306. By Michael Hall

Re-create migration for proper order, set launchpad-imported meetings to Approved by default

305. By Chris Johnston

Updates

304. By Chris Johnston

Starting on side bar stuffs

303. By Chris Johnston

Adds sidenav theme stuff

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed file 'summit/schedule/migrations/0017_add_review_status.py'
--- summit/schedule/migrations/0017_add_review_status.py 2012-03-02 03:33:15 +0000
+++ summit/schedule/migrations/0017_add_review_status.py 1970-01-01 00:00:00 +0000
@@ -1,204 +0,0 @@
1# encoding: utf-8
2import datetime
3from south.db import db
4from south.v2 import SchemaMigration
5from django.db import models
6
7class Migration(SchemaMigration):
8
9 def forwards(self, orm):
10
11 # Adding field 'Meeting.approved'
12 db.add_column('schedule_meeting', 'approved', self.gf('django.db.models.fields.CharField')(default='PENDING', max_length=10, null=True), keep_default=False)
13
14
15 def backwards(self, orm):
16
17 # Deleting field 'Meeting.approved'
18 db.delete_column('schedule_meeting', 'approved')
19
20
21 models = {
22 'auth.group': {
23 'Meta': {'object_name': 'Group'},
24 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
25 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
26 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
27 },
28 'auth.permission': {
29 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
30 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
31 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
32 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
33 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
34 },
35 'auth.user': {
36 'Meta': {'ordering': "['username']", 'object_name': 'User'},
37 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
38 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
39 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
40 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
41 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
42 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
43 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
44 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
45 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
46 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
47 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
48 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
49 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
50 },
51 'contenttypes.contenttype': {
52 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
53 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
54 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
55 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
56 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
57 },
58 'schedule.agenda': {
59 'Meta': {'ordering': "('slot', 'room')", 'unique_together': "(('slot', 'room'),)", 'object_name': 'Agenda'},
60 'auto': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
61 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
62 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}),
63 'room': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Room']"}),
64 'slot': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Slot']"})
65 },
66 'schedule.attendee': {
67 'Meta': {'ordering': "('user__username', 'summit')", 'object_name': 'Attendee'},
68 'crew': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_column': "'crew'"}),
69 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
70 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
71 'secret_key_id': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
72 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
73 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
74 'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Topic']", 'symmetrical': 'False', 'blank': 'True'}),
75 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
76 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
77 },
78 'schedule.attendeebusy': {
79 'Meta': {'ordering': "('attendee', 'start_utc', 'end_utc')", 'object_name': 'AttendeeBusy'},
80 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Attendee']"}),
81 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
82 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
83 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"})
84 },
85 'schedule.crew': {
86 'Meta': {'ordering': "('date_utc', 'attendee')", 'object_name': 'Crew'},
87 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'crew_schedule'", 'to': "orm['schedule.Attendee']"}),
88 'date_utc': ('django.db.models.fields.DateField', [], {'db_column': "'date'"}),
89 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
90 },
91 'schedule.lead': {
92 'Meta': {'ordering': "('summit', 'track')", 'object_name': 'Lead'},
93 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
94 'lead': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'lead'", 'to': "orm['schedule.Attendee']"}),
95 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
96 'track': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Track']"})
97 },
98 'schedule.meeting': {
99 'Meta': {'object_name': 'Meeting'},
100 'approved': ('django.db.models.fields.CharField', [], {'default': "'PENDING'", 'max_length': '10', 'null': 'True'}),
101 'approver': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'approver_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
102 'assignee': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'assignee_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
103 'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}),
104 'drafter': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'drafter_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
105 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
106 'name': ('summit.schedule.fields.NameField', [], {'max_length': '100'}),
107 'pad_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
108 'participants': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Attendee']", 'symmetrical': 'False', 'through': "orm['schedule.Participant']", 'blank': 'True'}),
109 'priority': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
110 'private': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
111 'private_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
112 'requires_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
113 'scribe': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scribe_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
114 'slots': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
115 'spec_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
116 'status': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
117 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
118 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
119 'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Topic']", 'symmetrical': 'False', 'blank': 'True'}),
120 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
121 'type': ('django.db.models.fields.CharField', [], {'default': "u'blueprint'", 'max_length': '15'}),
122 'video': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
123 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
124 },
125 'schedule.participant': {
126 'Meta': {'ordering': "('meeting', 'attendee', 'required')", 'object_name': 'Participant'},
127 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Attendee']"}),
128 'from_launchpad': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
129 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
130 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}),
131 'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
132 },
133 'schedule.room': {
134 'Meta': {'ordering': "('summit', 'name')", 'object_name': 'Room'},
135 'end_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'end'", 'blank': 'True'}),
136 'has_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
137 'icecast_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
138 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
139 'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
140 'size': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
141 'start_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'start'", 'blank': 'True'}),
142 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
143 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
144 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
145 'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'})
146 },
147 'schedule.roombusy': {
148 'Meta': {'ordering': "('room', 'start_utc', 'end_utc')", 'object_name': 'RoomBusy'},
149 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
150 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
151 'room': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Room']"}),
152 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"})
153 },
154 'schedule.slot': {
155 'Meta': {'ordering': "('summit', 'start_utc', 'end_utc')", 'object_name': 'Slot'},
156 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
157 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
158 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
159 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
160 'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'})
161 },
162 'schedule.summit': {
163 'Meta': {'ordering': "('name',)", 'object_name': 'Summit'},
164 'date_end': ('django.db.models.fields.DateField', [], {'null': 'True'}),
165 'date_start': ('django.db.models.fields.DateField', [], {'null': 'True'}),
166 'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}),
167 'etherpad': ('django.db.models.fields.URLField', [], {'default': "'http://pad.ubuntu.com/'", 'max_length': '75'}),
168 'hashtag': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
169 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
170 'last_update': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
171 'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
172 'managers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'managers'", 'blank': 'True', 'to': "orm['auth.User']"}),
173 'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
174 'qr': ('django.db.models.fields.URLField', [], {'default': "''", 'max_length': '100', 'blank': 'True'}),
175 'schedulers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'schedulers'", 'blank': 'True', 'to': "orm['auth.User']"}),
176 'state': ('django.db.models.fields.CharField', [], {'default': "u'sponsor'", 'max_length': '10'}),
177 'timezone': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
178 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
179 },
180 'schedule.summitsprint': {
181 'Meta': {'ordering': "('summit', 'import_url')", 'object_name': 'SummitSprint'},
182 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
183 'import_url': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
184 'summit': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sprint_set'", 'to': "orm['schedule.Summit']"})
185 },
186 'schedule.topic': {
187 'Meta': {'ordering': "('summit', 'title')", 'object_name': 'Topic'},
188 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
189 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
190 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
191 },
192 'schedule.track': {
193 'Meta': {'ordering': "('summit', 'title', 'slug')", 'object_name': 'Track'},
194 'allow_adjacent_sessions': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
195 'color': ('django.db.models.fields.CharField', [], {'default': "'FFFFFF'", 'max_length': '6'}),
196 'description': ('django.db.models.fields.TextField', [], {'max_length': '1000', 'null': 'True'}),
197 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
198 'slug': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
199 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
200 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
201 }
202 }
203
204 complete_apps = ['schedule']
2050
=== added file 'summit/schedule/migrations/0018_add_review_status.py'
--- summit/schedule/migrations/0018_add_review_status.py 1970-01-01 00:00:00 +0000
+++ summit/schedule/migrations/0018_add_review_status.py 2012-03-18 23:11:18 +0000
@@ -0,0 +1,205 @@
1# encoding: utf-8
2import datetime
3from south.db import db
4from south.v2 import SchemaMigration
5from django.db import models
6
7class Migration(SchemaMigration):
8
9 def forwards(self, orm):
10
11 # Adding field 'Meeting.approved'
12 db.add_column('schedule_meeting', 'approved', self.gf('django.db.models.fields.CharField')(default='PENDING', max_length=10, null=True), keep_default=False)
13
14
15 def backwards(self, orm):
16
17 # Deleting field 'Meeting.approved'
18 db.delete_column('schedule_meeting', 'approved')
19
20
21 models = {
22 'auth.group': {
23 'Meta': {'object_name': 'Group'},
24 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
25 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
26 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
27 },
28 'auth.permission': {
29 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
30 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
31 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
32 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
33 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
34 },
35 'auth.user': {
36 'Meta': {'ordering': "['username']", 'object_name': 'User'},
37 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
38 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
39 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
40 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
41 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
42 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
43 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
44 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
45 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
46 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
47 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
48 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
49 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
50 },
51 'contenttypes.contenttype': {
52 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
53 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
54 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
55 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
56 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
57 },
58 'schedule.agenda': {
59 'Meta': {'ordering': "('slot', 'room')", 'unique_together': "(('slot', 'room'),)", 'object_name': 'Agenda'},
60 'auto': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
61 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
62 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}),
63 'room': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Room']"}),
64 'slot': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Slot']"})
65 },
66 'schedule.attendee': {
67 'Meta': {'ordering': "('user__username', 'summit')", 'object_name': 'Attendee'},
68 'crew': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_column': "'crew'"}),
69 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
70 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
71 'secret_key_id': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
72 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
73 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
74 'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Topic']", 'symmetrical': 'False', 'blank': 'True'}),
75 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
76 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
77 },
78 'schedule.attendeebusy': {
79 'Meta': {'ordering': "('attendee', 'start_utc', 'end_utc')", 'object_name': 'AttendeeBusy'},
80 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Attendee']"}),
81 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
82 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
83 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"})
84 },
85 'schedule.crew': {
86 'Meta': {'ordering': "('date_utc', 'attendee')", 'object_name': 'Crew'},
87 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'crew_schedule'", 'to': "orm['schedule.Attendee']"}),
88 'date_utc': ('django.db.models.fields.DateField', [], {'db_column': "'date'"}),
89 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
90 },
91 'schedule.lead': {
92 'Meta': {'ordering': "('summit', 'track')", 'object_name': 'Lead'},
93 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
94 'lead': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'lead'", 'to': "orm['schedule.Attendee']"}),
95 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
96 'track': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Track']"})
97 },
98 'schedule.meeting': {
99 'Meta': {'object_name': 'Meeting'},
100 'approved': ('django.db.models.fields.CharField', [], {'default': "'PENDING'", 'max_length': '10', 'null': 'True'}),
101 'approver': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'approver_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
102 'assignee': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'assignee_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
103 'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}),
104 'drafter': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'drafter_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
105 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
106 'name': ('summit.schedule.fields.NameField', [], {'max_length': '100'}),
107 'pad_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
108 'participants': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Attendee']", 'symmetrical': 'False', 'through': "orm['schedule.Participant']", 'blank': 'True'}),
109 'priority': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
110 'private': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
111 'private_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
112 'requires_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
113 'scribe': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scribe_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
114 'slots': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
115 'spec_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
116 'status': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
117 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
118 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
119 'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Topic']", 'symmetrical': 'False', 'blank': 'True'}),
120 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
121 'type': ('django.db.models.fields.CharField', [], {'default': "u'blueprint'", 'max_length': '15'}),
122 'video': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
123 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
124 },
125 'schedule.participant': {
126 'Meta': {'ordering': "('meeting', 'attendee', 'required')", 'object_name': 'Participant'},
127 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Attendee']"}),
128 'from_launchpad': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
129 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
130 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}),
131 'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
132 },
133 'schedule.room': {
134 'Meta': {'ordering': "('summit', 'name')", 'object_name': 'Room'},
135 'end_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'end'", 'blank': 'True'}),
136 'has_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
137 'icecast_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
138 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
139 'irc_channel': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
140 'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
141 'size': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
142 'start_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'start'", 'blank': 'True'}),
143 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
144 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
145 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
146 'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'})
147 },
148 'schedule.roombusy': {
149 'Meta': {'ordering': "('room', 'start_utc', 'end_utc')", 'object_name': 'RoomBusy'},
150 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
151 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
152 'room': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Room']"}),
153 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"})
154 },
155 'schedule.slot': {
156 'Meta': {'ordering': "('summit', 'start_utc', 'end_utc')", 'object_name': 'Slot'},
157 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
158 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
159 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
160 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
161 'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'})
162 },
163 'schedule.summit': {
164 'Meta': {'ordering': "('name',)", 'object_name': 'Summit'},
165 'date_end': ('django.db.models.fields.DateField', [], {'null': 'True'}),
166 'date_start': ('django.db.models.fields.DateField', [], {'null': 'True'}),
167 'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}),
168 'etherpad': ('django.db.models.fields.URLField', [], {'default': "'http://pad.ubuntu.com/'", 'max_length': '75'}),
169 'hashtag': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
170 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
171 'last_update': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
172 'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
173 'managers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'managers'", 'blank': 'True', 'to': "orm['auth.User']"}),
174 'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
175 'qr': ('django.db.models.fields.URLField', [], {'default': "''", 'max_length': '100', 'blank': 'True'}),
176 'schedulers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'schedulers'", 'blank': 'True', 'to': "orm['auth.User']"}),
177 'state': ('django.db.models.fields.CharField', [], {'default': "u'sponsor'", 'max_length': '10'}),
178 'timezone': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
179 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
180 },
181 'schedule.summitsprint': {
182 'Meta': {'ordering': "('summit', 'import_url')", 'object_name': 'SummitSprint'},
183 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
184 'import_url': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
185 'summit': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sprint_set'", 'to': "orm['schedule.Summit']"})
186 },
187 'schedule.topic': {
188 'Meta': {'ordering': "('summit', 'title')", 'object_name': 'Topic'},
189 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
190 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
191 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
192 },
193 'schedule.track': {
194 'Meta': {'ordering': "('summit', 'title', 'slug')", 'object_name': 'Track'},
195 'allow_adjacent_sessions': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
196 'color': ('django.db.models.fields.CharField', [], {'default': "'FFFFFF'", 'max_length': '6'}),
197 'description': ('django.db.models.fields.TextField', [], {'max_length': '1000', 'null': 'True'}),
198 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
199 'slug': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
200 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
201 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
202 }
203 }
204
205 complete_apps = ['schedule']
0206
=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py 2012-03-02 03:33:15 +0000
+++ summit/schedule/models/meetingmodel.py 2012-03-18 23:11:18 +0000
@@ -259,6 +259,9 @@
259259
260 def update_from_launchpad(self, elem):260 def update_from_launchpad(self, elem):
261 """Update from Launchpad data."""261 """Update from Launchpad data."""
262
263 self.approved = 'APPROVED'
264
262 status = elem.get("status")265 status = elem.get("status")
263 if status:266 if status:
264 self.status = status267 self.status = status

Subscribers

People subscribed via source and target branches

to all changes: