Summit

Merge lp:~danilo/summit/bug-912347 into lp:summit

  1. bug-912347
  2. Merge into trunk
Proposed by Данило Шеган
Status: Merged
Approved by: Chris Johnston
Approved revision: 237
Merged at revision: 237
Proposed branch: lp:~danilo/summit/bug-912347
Merge into: lp:summit
Diff against target: 244 lines (+203/-4)
4 files modified
summit/schedule/migrations/0010_extend_meeting_name_field.py (+198/-0)
summit/schedule/models/meetingmodel.py (+1/-1)
summit/schedule/models/summitmodel.py (+1/-1)
summit/schedule/tests.py (+3/-2)
To merge this branch: bzr merge lp:~danilo/summit/bug-912347
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+87649@code.launchpad.net

Commit message

Changes meeting name to 100 chars

Description of the change

= Bug 912347 =

Allow meeting names to hold more than 50 characters: extend it to 100 characters.

Migration was created using

 (cd summit && \
  ./manage.py schemamigration schedule extend_meeting_name_field --auto)

(and then videographer1/videographer2 field changes have been removed
from summit/schedule/migrations/0010_extend_meeting_name_field.py — file is otherwise completely auto-generated by the instructions from the south docs)

Migration was applied using

 ./summit/manage.py migrate schedule

and this was then confirmed to have schedule_meeting.name as varchar(100) using sqlite summit/summit.db and ".schema schedule_meeting".

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'summit/schedule/migrations/0010_extend_meeting_name_field.py'
2--- summit/schedule/migrations/0010_extend_meeting_name_field.py 1970-01-01 00:00:00 +0000
3+++ summit/schedule/migrations/0010_extend_meeting_name_field.py 2012-01-05 16:44:34 +0000
4@@ -0,0 +1,198 @@
5+# encoding: utf-8
6+import datetime
7+from south.db import db
8+from south.v2 import SchemaMigration
9+from django.db import models
10+
11+
12+class Migration(SchemaMigration):
13+
14+ def forwards(self, orm):
15+
16+ # Changing field 'Meeting.name'
17+ db.alter_column('schedule_meeting', 'name', self.gf('summit.schedule.fields.NameField')(max_length=100))
18+
19+
20+ def backwards(self, orm):
21+
22+ # Changing field 'Meeting.name'
23+ db.alter_column('schedule_meeting', 'name', self.gf('summit.schedule.fields.NameField')(max_length=50))
24+
25+
26+ models = {
27+ 'auth.group': {
28+ 'Meta': {'object_name': 'Group'},
29+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
30+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
31+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
32+ },
33+ 'auth.permission': {
34+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
35+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
36+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
37+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
38+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
39+ },
40+ 'auth.user': {
41+ 'Meta': {'object_name': 'User'},
42+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
43+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
44+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
45+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
46+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
47+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
48+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
49+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
50+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
51+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
52+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
53+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
54+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
55+ },
56+ 'contenttypes.contenttype': {
57+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
58+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
59+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
60+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
61+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
62+ },
63+ 'schedule.agenda': {
64+ 'Meta': {'ordering': "('slot', 'room')", 'unique_together': "(('slot', 'room'),)", 'object_name': 'Agenda'},
65+ 'auto': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
66+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
67+ 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}),
68+ 'room': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Room']"}),
69+ 'slot': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Slot']"})
70+ },
71+ 'schedule.attendee': {
72+ 'Meta': {'ordering': "('summit', 'user')", 'object_name': 'Attendee'},
73+ 'crew': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_column': "'crew'"}),
74+ 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
75+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
76+ 'secret_key_id': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
77+ 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
78+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
79+ 'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Topic']", 'symmetrical': 'False', 'blank': 'True'}),
80+ 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
81+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
82+ },
83+ 'schedule.attendeebusy': {
84+ 'Meta': {'ordering': "('attendee', 'start_utc', 'end_utc')", 'object_name': 'AttendeeBusy'},
85+ 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Attendee']"}),
86+ 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
87+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
88+ 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"})
89+ },
90+ 'schedule.crew': {
91+ 'Meta': {'ordering': "('date_utc', 'attendee')", 'object_name': 'Crew'},
92+ 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'crew_schedule'", 'to': "orm['schedule.Attendee']"}),
93+ 'date_utc': ('django.db.models.fields.DateField', [], {'db_column': "'date'"}),
94+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
95+ },
96+ 'schedule.lead': {
97+ 'Meta': {'ordering': "('summit', 'track')", 'object_name': 'Lead'},
98+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
99+ 'lead': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'lead'", 'to': "orm['schedule.Attendee']"}),
100+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
101+ 'track': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Track']"})
102+ },
103+ 'schedule.meeting': {
104+ 'Meta': {'object_name': 'Meeting'},
105+ 'approver': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'approver_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
106+ 'assignee': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'assignee_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
107+ 'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}),
108+ 'drafter': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'drafter_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
109+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
110+ 'name': ('summit.schedule.fields.NameField', [], {'max_length': '100', 'blank': 'True'}),
111+ 'pad_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
112+ 'participants': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Attendee']", 'symmetrical': 'False', 'through': "orm['schedule.Participant']", 'blank': 'True'}),
113+ 'priority': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
114+ 'private': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
115+ 'requires_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
116+ 'scribe': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scribe_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
117+ 'slots': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
118+ 'spec_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
119+ 'status': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
120+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
121+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
122+ 'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Topic']", 'symmetrical': 'False', 'blank': 'True'}),
123+ 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
124+ 'type': ('django.db.models.fields.CharField', [], {'default': "u'blueprint'", 'max_length': '15'}),
125+ 'video': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
126+ 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
127+ },
128+ 'schedule.participant': {
129+ 'Meta': {'ordering': "('meeting', 'attendee', 'required')", 'object_name': 'Participant'},
130+ 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Attendee']"}),
131+ 'from_launchpad': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
132+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
133+ 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}),
134+ 'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
135+ },
136+ 'schedule.room': {
137+ 'Meta': {'ordering': "('summit', 'name')", 'object_name': 'Room'},
138+ 'end_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'end'", 'blank': 'True'}),
139+ 'has_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
140+ 'icecast_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
141+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
142+ 'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
143+ 'size': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
144+ 'start_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'start'", 'blank': 'True'}),
145+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
146+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
147+ 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
148+ 'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'})
149+ },
150+ 'schedule.roombusy': {
151+ 'Meta': {'ordering': "('room', 'start_utc', 'end_utc')", 'object_name': 'RoomBusy'},
152+ 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
153+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
154+ 'room': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Room']"}),
155+ 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"})
156+ },
157+ 'schedule.slot': {
158+ 'Meta': {'ordering': "('summit', 'start_utc', 'end_utc')", 'object_name': 'Slot'},
159+ 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
160+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
161+ 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
162+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
163+ 'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'})
164+ },
165+ 'schedule.summit': {
166+ 'Meta': {'ordering': "('name',)", 'object_name': 'Summit'},
167+ 'date_end': ('django.db.models.fields.DateField', [], {'null': 'True'}),
168+ 'date_start': ('django.db.models.fields.DateField', [], {'null': 'True'}),
169+ 'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', '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+ 'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
174+ 'state': ('django.db.models.fields.CharField', [], {'default': "u'sponsor'", 'max_length': '10'}),
175+ 'timezone': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
176+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
177+ },
178+ 'schedule.summitsprint': {
179+ 'Meta': {'ordering': "('summit', 'import_url')", 'object_name': 'SummitSprint'},
180+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
181+ 'import_url': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
182+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sprint_set'", 'to': "orm['schedule.Summit']"})
183+ },
184+ 'schedule.topic': {
185+ 'Meta': {'ordering': "('summit', 'title')", 'object_name': 'Topic'},
186+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
187+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
188+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
189+ },
190+ 'schedule.track': {
191+ 'Meta': {'ordering': "('summit', 'title', 'slug')", 'object_name': 'Track'},
192+ 'allow_adjacent_sessions': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
193+ 'color': ('django.db.models.fields.CharField', [], {'default': "'FFFFFF'", 'max_length': '6'}),
194+ 'description': ('django.db.models.fields.TextField', [], {'max_length': '1000', 'null': 'True'}),
195+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
196+ 'slug': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
197+ 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
198+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
199+ }
200+ }
201+
202+ complete_apps = ['schedule']
203
204=== modified file 'summit/schedule/models/meetingmodel.py'
205--- summit/schedule/models/meetingmodel.py 2011-12-22 17:11:36 +0000
206+++ summit/schedule/models/meetingmodel.py 2012-01-05 16:44:34 +0000
207@@ -70,7 +70,7 @@
208 )
209
210 summit = models.ForeignKey(Summit)
211- name = NameField(max_length=50, blank=True)
212+ name = NameField(max_length=100, blank=True)
213 title = models.CharField(max_length=100)
214 description = models.TextField(max_length=2047, blank=True)
215 type = models.CharField(max_length=15, choices=TYPE_CHOICES,
216
217=== modified file 'summit/schedule/models/summitmodel.py'
218--- summit/schedule/models/summitmodel.py 2011-12-04 15:49:32 +0000
219+++ summit/schedule/models/summitmodel.py 2012-01-05 16:44:34 +0000
220@@ -276,7 +276,7 @@
221 full_name = elem.get("name", "")
222 if not full_name:
223 return
224- name = full_name[:50]
225+ name = full_name[:100]
226
227 print "meeting %s" % name
228 meeting = ""
229
230=== modified file 'summit/schedule/tests.py'
231--- summit/schedule/tests.py 2011-11-30 17:46:39 +0000
232+++ summit/schedule/tests.py 2012-01-05 16:44:34 +0000
233@@ -1660,9 +1660,10 @@
234
235 def test_update_meeting_trims_name(self):
236 summit = factory.make_one(Summit)
237- elem = LaunchpadExportNode(name="very" * 12 + "longname")
238+ elem = LaunchpadExportNode(name="very " * 20 + "longname")
239 meeting = summit.update_meeting_from_launchpad(elem)
240- expected_name = "very" * 12 + "lo"
241+ # Names are truncated at 100 chars.
242+ expected_name = "very " * 20
243 self.assertEqual(expected_name, meeting.name)
244 self.assertEqual(1, summit.meeting_set.filter(name__exact=expected_name).count())
245

Subscribers

People subscribed via source and target branches