Merge lp:~mhall119/summit/new-meeting-stuff into lp:~cjohnston/summit/new-meeting-stuff
- new-meeting-stuff
- Merge into 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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Johnston | Pending | ||
Review via email: mp+98116@code.launchpad.net |
Commit message
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
1 | === removed file 'summit/schedule/migrations/0017_add_review_status.py' | |||
2 | --- summit/schedule/migrations/0017_add_review_status.py 2012-03-02 03:33:15 +0000 | |||
3 | +++ summit/schedule/migrations/0017_add_review_status.py 1970-01-01 00:00:00 +0000 | |||
4 | @@ -1,204 +0,0 @@ | |||
5 | 1 | # encoding: utf-8 | ||
6 | 2 | import datetime | ||
7 | 3 | from south.db import db | ||
8 | 4 | from south.v2 import SchemaMigration | ||
9 | 5 | from django.db import models | ||
10 | 6 | |||
11 | 7 | class Migration(SchemaMigration): | ||
12 | 8 | |||
13 | 9 | def forwards(self, orm): | ||
14 | 10 | |||
15 | 11 | # Adding field 'Meeting.approved' | ||
16 | 12 | db.add_column('schedule_meeting', 'approved', self.gf('django.db.models.fields.CharField')(default='PENDING', max_length=10, null=True), keep_default=False) | ||
17 | 13 | |||
18 | 14 | |||
19 | 15 | def backwards(self, orm): | ||
20 | 16 | |||
21 | 17 | # Deleting field 'Meeting.approved' | ||
22 | 18 | db.delete_column('schedule_meeting', 'approved') | ||
23 | 19 | |||
24 | 20 | |||
25 | 21 | models = { | ||
26 | 22 | 'auth.group': { | ||
27 | 23 | 'Meta': {'object_name': 'Group'}, | ||
28 | 24 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
29 | 25 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
30 | 26 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
31 | 27 | }, | ||
32 | 28 | 'auth.permission': { | ||
33 | 29 | 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, | ||
34 | 30 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
35 | 31 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
36 | 32 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
37 | 33 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
38 | 34 | }, | ||
39 | 35 | 'auth.user': { | ||
40 | 36 | 'Meta': {'ordering': "['username']", 'object_name': 'User'}, | ||
41 | 37 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
42 | 38 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
43 | 39 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
44 | 40 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
45 | 41 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
46 | 42 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
47 | 43 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
48 | 44 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
49 | 45 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
50 | 46 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
51 | 47 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
52 | 48 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
53 | 49 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
54 | 50 | }, | ||
55 | 51 | 'contenttypes.contenttype': { | ||
56 | 52 | 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, | ||
57 | 53 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
58 | 54 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
59 | 55 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
60 | 56 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
61 | 57 | }, | ||
62 | 58 | 'schedule.agenda': { | ||
63 | 59 | 'Meta': {'ordering': "('slot', 'room')", 'unique_together': "(('slot', 'room'),)", 'object_name': 'Agenda'}, | ||
64 | 60 | 'auto': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
65 | 61 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
66 | 62 | 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}), | ||
67 | 63 | 'room': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Room']"}), | ||
68 | 64 | 'slot': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Slot']"}) | ||
69 | 65 | }, | ||
70 | 66 | 'schedule.attendee': { | ||
71 | 67 | 'Meta': {'ordering': "('user__username', 'summit')", 'object_name': 'Attendee'}, | ||
72 | 68 | 'crew': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_column': "'crew'"}), | ||
73 | 69 | 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}), | ||
74 | 70 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
75 | 71 | 'secret_key_id': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
76 | 72 | 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}), | ||
77 | 73 | 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}), | ||
78 | 74 | 'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Topic']", 'symmetrical': 'False', 'blank': 'True'}), | ||
79 | 75 | 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}), | ||
80 | 76 | 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) | ||
81 | 77 | }, | ||
82 | 78 | 'schedule.attendeebusy': { | ||
83 | 79 | 'Meta': {'ordering': "('attendee', 'start_utc', 'end_utc')", 'object_name': 'AttendeeBusy'}, | ||
84 | 80 | 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Attendee']"}), | ||
85 | 81 | 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}), | ||
86 | 82 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
87 | 83 | 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}) | ||
88 | 84 | }, | ||
89 | 85 | 'schedule.crew': { | ||
90 | 86 | 'Meta': {'ordering': "('date_utc', 'attendee')", 'object_name': 'Crew'}, | ||
91 | 87 | 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'crew_schedule'", 'to': "orm['schedule.Attendee']"}), | ||
92 | 88 | 'date_utc': ('django.db.models.fields.DateField', [], {'db_column': "'date'"}), | ||
93 | 89 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) | ||
94 | 90 | }, | ||
95 | 91 | 'schedule.lead': { | ||
96 | 92 | 'Meta': {'ordering': "('summit', 'track')", 'object_name': 'Lead'}, | ||
97 | 93 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
98 | 94 | 'lead': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'lead'", 'to': "orm['schedule.Attendee']"}), | ||
99 | 95 | 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}), | ||
100 | 96 | 'track': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Track']"}) | ||
101 | 97 | }, | ||
102 | 98 | 'schedule.meeting': { | ||
103 | 99 | 'Meta': {'object_name': 'Meeting'}, | ||
104 | 100 | 'approved': ('django.db.models.fields.CharField', [], {'default': "'PENDING'", 'max_length': '10', 'null': 'True'}), | ||
105 | 101 | 'approver': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'approver_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}), | ||
106 | 102 | 'assignee': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'assignee_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}), | ||
107 | 103 | 'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}), | ||
108 | 104 | 'drafter': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'drafter_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}), | ||
109 | 105 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
110 | 106 | 'name': ('summit.schedule.fields.NameField', [], {'max_length': '100'}), | ||
111 | 107 | 'pad_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
112 | 108 | 'participants': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Attendee']", 'symmetrical': 'False', 'through': "orm['schedule.Participant']", 'blank': 'True'}), | ||
113 | 109 | 'priority': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), | ||
114 | 110 | 'private': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
115 | 111 | 'private_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
116 | 112 | 'requires_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
117 | 113 | 'scribe': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scribe_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}), | ||
118 | 114 | 'slots': ('django.db.models.fields.IntegerField', [], {'default': '1'}), | ||
119 | 115 | 'spec_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), | ||
120 | 116 | 'status': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), | ||
121 | 117 | 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}), | ||
122 | 118 | 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
123 | 119 | 'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Topic']", 'symmetrical': 'False', 'blank': 'True'}), | ||
124 | 120 | 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}), | ||
125 | 121 | 'type': ('django.db.models.fields.CharField', [], {'default': "u'blueprint'", 'max_length': '15'}), | ||
126 | 122 | 'video': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
127 | 123 | 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}) | ||
128 | 124 | }, | ||
129 | 125 | 'schedule.participant': { | ||
130 | 126 | 'Meta': {'ordering': "('meeting', 'attendee', 'required')", 'object_name': 'Participant'}, | ||
131 | 127 | 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Attendee']"}), | ||
132 | 128 | 'from_launchpad': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
133 | 129 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
134 | 130 | 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}), | ||
135 | 131 | 'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) | ||
136 | 132 | }, | ||
137 | 133 | 'schedule.room': { | ||
138 | 134 | 'Meta': {'ordering': "('summit', 'name')", 'object_name': 'Room'}, | ||
139 | 135 | 'end_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'end'", 'blank': 'True'}), | ||
140 | 136 | 'has_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
141 | 137 | 'icecast_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), | ||
142 | 138 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
143 | 139 | 'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}), | ||
144 | 140 | 'size': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
145 | 141 | 'start_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'start'", 'blank': 'True'}), | ||
146 | 142 | 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}), | ||
147 | 143 | 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
148 | 144 | 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}), | ||
149 | 145 | 'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'}) | ||
150 | 146 | }, | ||
151 | 147 | 'schedule.roombusy': { | ||
152 | 148 | 'Meta': {'ordering': "('room', 'start_utc', 'end_utc')", 'object_name': 'RoomBusy'}, | ||
153 | 149 | 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}), | ||
154 | 150 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
155 | 151 | 'room': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Room']"}), | ||
156 | 152 | 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}) | ||
157 | 153 | }, | ||
158 | 154 | 'schedule.slot': { | ||
159 | 155 | 'Meta': {'ordering': "('summit', 'start_utc', 'end_utc')", 'object_name': 'Slot'}, | ||
160 | 156 | 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}), | ||
161 | 157 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
162 | 158 | 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}), | ||
163 | 159 | 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}), | ||
164 | 160 | 'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'}) | ||
165 | 161 | }, | ||
166 | 162 | 'schedule.summit': { | ||
167 | 163 | 'Meta': {'ordering': "('name',)", 'object_name': 'Summit'}, | ||
168 | 164 | 'date_end': ('django.db.models.fields.DateField', [], {'null': 'True'}), | ||
169 | 165 | 'date_start': ('django.db.models.fields.DateField', [], {'null': 'True'}), | ||
170 | 166 | 'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}), | ||
171 | 167 | 'etherpad': ('django.db.models.fields.URLField', [], {'default': "'http://pad.ubuntu.com/'", 'max_length': '75'}), | ||
172 | 168 | 'hashtag': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}), | ||
173 | 169 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
174 | 170 | 'last_update': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), | ||
175 | 171 | 'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), | ||
176 | 172 | 'managers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'managers'", 'blank': 'True', 'to': "orm['auth.User']"}), | ||
177 | 173 | 'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}), | ||
178 | 174 | 'qr': ('django.db.models.fields.URLField', [], {'default': "''", 'max_length': '100', 'blank': 'True'}), | ||
179 | 175 | 'schedulers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'schedulers'", 'blank': 'True', 'to': "orm['auth.User']"}), | ||
180 | 176 | 'state': ('django.db.models.fields.CharField', [], {'default': "u'sponsor'", 'max_length': '10'}), | ||
181 | 177 | 'timezone': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
182 | 178 | 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
183 | 179 | }, | ||
184 | 180 | 'schedule.summitsprint': { | ||
185 | 181 | 'Meta': {'ordering': "('summit', 'import_url')", 'object_name': 'SummitSprint'}, | ||
186 | 182 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
187 | 183 | 'import_url': ('django.db.models.fields.URLField', [], {'max_length': '200'}), | ||
188 | 184 | 'summit': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sprint_set'", 'to': "orm['schedule.Summit']"}) | ||
189 | 185 | }, | ||
190 | 186 | 'schedule.topic': { | ||
191 | 187 | 'Meta': {'ordering': "('summit', 'title')", 'object_name': 'Topic'}, | ||
192 | 188 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
193 | 189 | 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}), | ||
194 | 190 | 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
195 | 191 | }, | ||
196 | 192 | 'schedule.track': { | ||
197 | 193 | 'Meta': {'ordering': "('summit', 'title', 'slug')", 'object_name': 'Track'}, | ||
198 | 194 | 'allow_adjacent_sessions': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
199 | 195 | 'color': ('django.db.models.fields.CharField', [], {'default': "'FFFFFF'", 'max_length': '6'}), | ||
200 | 196 | 'description': ('django.db.models.fields.TextField', [], {'max_length': '1000', 'null': 'True'}), | ||
201 | 197 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
202 | 198 | 'slug': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}), | ||
203 | 199 | 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}), | ||
204 | 200 | 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
205 | 201 | } | ||
206 | 202 | } | ||
207 | 203 | |||
208 | 204 | complete_apps = ['schedule'] | ||
209 | 205 | 0 | ||
210 | === added file 'summit/schedule/migrations/0018_add_review_status.py' | |||
211 | --- summit/schedule/migrations/0018_add_review_status.py 1970-01-01 00:00:00 +0000 | |||
212 | +++ summit/schedule/migrations/0018_add_review_status.py 2012-03-18 23:11:18 +0000 | |||
213 | @@ -0,0 +1,205 @@ | |||
214 | 1 | # encoding: utf-8 | ||
215 | 2 | import datetime | ||
216 | 3 | from south.db import db | ||
217 | 4 | from south.v2 import SchemaMigration | ||
218 | 5 | from django.db import models | ||
219 | 6 | |||
220 | 7 | class Migration(SchemaMigration): | ||
221 | 8 | |||
222 | 9 | def forwards(self, orm): | ||
223 | 10 | |||
224 | 11 | # Adding field 'Meeting.approved' | ||
225 | 12 | db.add_column('schedule_meeting', 'approved', self.gf('django.db.models.fields.CharField')(default='PENDING', max_length=10, null=True), keep_default=False) | ||
226 | 13 | |||
227 | 14 | |||
228 | 15 | def backwards(self, orm): | ||
229 | 16 | |||
230 | 17 | # Deleting field 'Meeting.approved' | ||
231 | 18 | db.delete_column('schedule_meeting', 'approved') | ||
232 | 19 | |||
233 | 20 | |||
234 | 21 | models = { | ||
235 | 22 | 'auth.group': { | ||
236 | 23 | 'Meta': {'object_name': 'Group'}, | ||
237 | 24 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
238 | 25 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
239 | 26 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
240 | 27 | }, | ||
241 | 28 | 'auth.permission': { | ||
242 | 29 | 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, | ||
243 | 30 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
244 | 31 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
245 | 32 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
246 | 33 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
247 | 34 | }, | ||
248 | 35 | 'auth.user': { | ||
249 | 36 | 'Meta': {'ordering': "['username']", 'object_name': 'User'}, | ||
250 | 37 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
251 | 38 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
252 | 39 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
253 | 40 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
254 | 41 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
255 | 42 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
256 | 43 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
257 | 44 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
258 | 45 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
259 | 46 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
260 | 47 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
261 | 48 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
262 | 49 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
263 | 50 | }, | ||
264 | 51 | 'contenttypes.contenttype': { | ||
265 | 52 | 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, | ||
266 | 53 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
267 | 54 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
268 | 55 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
269 | 56 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
270 | 57 | }, | ||
271 | 58 | 'schedule.agenda': { | ||
272 | 59 | 'Meta': {'ordering': "('slot', 'room')", 'unique_together': "(('slot', 'room'),)", 'object_name': 'Agenda'}, | ||
273 | 60 | 'auto': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
274 | 61 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
275 | 62 | 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}), | ||
276 | 63 | 'room': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Room']"}), | ||
277 | 64 | 'slot': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Slot']"}) | ||
278 | 65 | }, | ||
279 | 66 | 'schedule.attendee': { | ||
280 | 67 | 'Meta': {'ordering': "('user__username', 'summit')", 'object_name': 'Attendee'}, | ||
281 | 68 | 'crew': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_column': "'crew'"}), | ||
282 | 69 | 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}), | ||
283 | 70 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
284 | 71 | 'secret_key_id': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
285 | 72 | 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}), | ||
286 | 73 | 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}), | ||
287 | 74 | 'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Topic']", 'symmetrical': 'False', 'blank': 'True'}), | ||
288 | 75 | 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}), | ||
289 | 76 | 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) | ||
290 | 77 | }, | ||
291 | 78 | 'schedule.attendeebusy': { | ||
292 | 79 | 'Meta': {'ordering': "('attendee', 'start_utc', 'end_utc')", 'object_name': 'AttendeeBusy'}, | ||
293 | 80 | 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Attendee']"}), | ||
294 | 81 | 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}), | ||
295 | 82 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
296 | 83 | 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}) | ||
297 | 84 | }, | ||
298 | 85 | 'schedule.crew': { | ||
299 | 86 | 'Meta': {'ordering': "('date_utc', 'attendee')", 'object_name': 'Crew'}, | ||
300 | 87 | 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'crew_schedule'", 'to': "orm['schedule.Attendee']"}), | ||
301 | 88 | 'date_utc': ('django.db.models.fields.DateField', [], {'db_column': "'date'"}), | ||
302 | 89 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) | ||
303 | 90 | }, | ||
304 | 91 | 'schedule.lead': { | ||
305 | 92 | 'Meta': {'ordering': "('summit', 'track')", 'object_name': 'Lead'}, | ||
306 | 93 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
307 | 94 | 'lead': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'lead'", 'to': "orm['schedule.Attendee']"}), | ||
308 | 95 | 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}), | ||
309 | 96 | 'track': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Track']"}) | ||
310 | 97 | }, | ||
311 | 98 | 'schedule.meeting': { | ||
312 | 99 | 'Meta': {'object_name': 'Meeting'}, | ||
313 | 100 | 'approved': ('django.db.models.fields.CharField', [], {'default': "'PENDING'", 'max_length': '10', 'null': 'True'}), | ||
314 | 101 | 'approver': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'approver_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}), | ||
315 | 102 | 'assignee': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'assignee_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}), | ||
316 | 103 | 'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}), | ||
317 | 104 | 'drafter': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'drafter_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}), | ||
318 | 105 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
319 | 106 | 'name': ('summit.schedule.fields.NameField', [], {'max_length': '100'}), | ||
320 | 107 | 'pad_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
321 | 108 | 'participants': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Attendee']", 'symmetrical': 'False', 'through': "orm['schedule.Participant']", 'blank': 'True'}), | ||
322 | 109 | 'priority': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), | ||
323 | 110 | 'private': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
324 | 111 | 'private_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
325 | 112 | 'requires_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
326 | 113 | 'scribe': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scribe_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}), | ||
327 | 114 | 'slots': ('django.db.models.fields.IntegerField', [], {'default': '1'}), | ||
328 | 115 | 'spec_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), | ||
329 | 116 | 'status': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), | ||
330 | 117 | 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}), | ||
331 | 118 | 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
332 | 119 | 'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Topic']", 'symmetrical': 'False', 'blank': 'True'}), | ||
333 | 120 | 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}), | ||
334 | 121 | 'type': ('django.db.models.fields.CharField', [], {'default': "u'blueprint'", 'max_length': '15'}), | ||
335 | 122 | 'video': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
336 | 123 | 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}) | ||
337 | 124 | }, | ||
338 | 125 | 'schedule.participant': { | ||
339 | 126 | 'Meta': {'ordering': "('meeting', 'attendee', 'required')", 'object_name': 'Participant'}, | ||
340 | 127 | 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Attendee']"}), | ||
341 | 128 | 'from_launchpad': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
342 | 129 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
343 | 130 | 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}), | ||
344 | 131 | 'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) | ||
345 | 132 | }, | ||
346 | 133 | 'schedule.room': { | ||
347 | 134 | 'Meta': {'ordering': "('summit', 'name')", 'object_name': 'Room'}, | ||
348 | 135 | 'end_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'end'", 'blank': 'True'}), | ||
349 | 136 | 'has_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
350 | 137 | 'icecast_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), | ||
351 | 138 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
352 | 139 | 'irc_channel': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}), | ||
353 | 140 | 'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}), | ||
354 | 141 | 'size': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
355 | 142 | 'start_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'start'", 'blank': 'True'}), | ||
356 | 143 | 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}), | ||
357 | 144 | 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
358 | 145 | 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}), | ||
359 | 146 | 'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'}) | ||
360 | 147 | }, | ||
361 | 148 | 'schedule.roombusy': { | ||
362 | 149 | 'Meta': {'ordering': "('room', 'start_utc', 'end_utc')", 'object_name': 'RoomBusy'}, | ||
363 | 150 | 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}), | ||
364 | 151 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
365 | 152 | 'room': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Room']"}), | ||
366 | 153 | 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}) | ||
367 | 154 | }, | ||
368 | 155 | 'schedule.slot': { | ||
369 | 156 | 'Meta': {'ordering': "('summit', 'start_utc', 'end_utc')", 'object_name': 'Slot'}, | ||
370 | 157 | 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}), | ||
371 | 158 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
372 | 159 | 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}), | ||
373 | 160 | 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}), | ||
374 | 161 | 'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'}) | ||
375 | 162 | }, | ||
376 | 163 | 'schedule.summit': { | ||
377 | 164 | 'Meta': {'ordering': "('name',)", 'object_name': 'Summit'}, | ||
378 | 165 | 'date_end': ('django.db.models.fields.DateField', [], {'null': 'True'}), | ||
379 | 166 | 'date_start': ('django.db.models.fields.DateField', [], {'null': 'True'}), | ||
380 | 167 | 'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}), | ||
381 | 168 | 'etherpad': ('django.db.models.fields.URLField', [], {'default': "'http://pad.ubuntu.com/'", 'max_length': '75'}), | ||
382 | 169 | 'hashtag': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}), | ||
383 | 170 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
384 | 171 | 'last_update': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), | ||
385 | 172 | 'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), | ||
386 | 173 | 'managers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'managers'", 'blank': 'True', 'to': "orm['auth.User']"}), | ||
387 | 174 | 'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}), | ||
388 | 175 | 'qr': ('django.db.models.fields.URLField', [], {'default': "''", 'max_length': '100', 'blank': 'True'}), | ||
389 | 176 | 'schedulers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'schedulers'", 'blank': 'True', 'to': "orm['auth.User']"}), | ||
390 | 177 | 'state': ('django.db.models.fields.CharField', [], {'default': "u'sponsor'", 'max_length': '10'}), | ||
391 | 178 | 'timezone': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
392 | 179 | 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
393 | 180 | }, | ||
394 | 181 | 'schedule.summitsprint': { | ||
395 | 182 | 'Meta': {'ordering': "('summit', 'import_url')", 'object_name': 'SummitSprint'}, | ||
396 | 183 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
397 | 184 | 'import_url': ('django.db.models.fields.URLField', [], {'max_length': '200'}), | ||
398 | 185 | 'summit': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sprint_set'", 'to': "orm['schedule.Summit']"}) | ||
399 | 186 | }, | ||
400 | 187 | 'schedule.topic': { | ||
401 | 188 | 'Meta': {'ordering': "('summit', 'title')", 'object_name': 'Topic'}, | ||
402 | 189 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
403 | 190 | 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}), | ||
404 | 191 | 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
405 | 192 | }, | ||
406 | 193 | 'schedule.track': { | ||
407 | 194 | 'Meta': {'ordering': "('summit', 'title', 'slug')", 'object_name': 'Track'}, | ||
408 | 195 | 'allow_adjacent_sessions': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
409 | 196 | 'color': ('django.db.models.fields.CharField', [], {'default': "'FFFFFF'", 'max_length': '6'}), | ||
410 | 197 | 'description': ('django.db.models.fields.TextField', [], {'max_length': '1000', 'null': 'True'}), | ||
411 | 198 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
412 | 199 | 'slug': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}), | ||
413 | 200 | 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}), | ||
414 | 201 | 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
415 | 202 | } | ||
416 | 203 | } | ||
417 | 204 | |||
418 | 205 | complete_apps = ['schedule'] | ||
419 | 0 | 206 | ||
420 | === modified file 'summit/schedule/models/meetingmodel.py' | |||
421 | --- summit/schedule/models/meetingmodel.py 2012-03-02 03:33:15 +0000 | |||
422 | +++ summit/schedule/models/meetingmodel.py 2012-03-18 23:11:18 +0000 | |||
423 | @@ -259,6 +259,9 @@ | |||
424 | 259 | 259 | ||
425 | 260 | def update_from_launchpad(self, elem): | 260 | def update_from_launchpad(self, elem): |
426 | 261 | """Update from Launchpad data.""" | 261 | """Update from Launchpad data.""" |
427 | 262 | |||
428 | 263 | self.approved = 'APPROVED' | ||
429 | 264 | |||
430 | 262 | status = elem.get("status") | 265 | status = elem.get("status") |
431 | 263 | if status: | 266 | if status: |
432 | 264 | self.status = status | 267 | self.status = status |