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
=== added file 'summit/schedule/migrations/0010_extend_meeting_name_field.py'
--- summit/schedule/migrations/0010_extend_meeting_name_field.py 1970-01-01 00:00:00 +0000
+++ summit/schedule/migrations/0010_extend_meeting_name_field.py 2012-01-05 16:44:34 +0000
@@ -0,0 +1,198 @@
1# encoding: utf-8
2import datetime
3from south.db import db
4from south.v2 import SchemaMigration
5from django.db import models
6
7
8class Migration(SchemaMigration):
9
10 def forwards(self, orm):
11
12 # Changing field 'Meeting.name'
13 db.alter_column('schedule_meeting', 'name', self.gf('summit.schedule.fields.NameField')(max_length=100))
14
15
16 def backwards(self, orm):
17
18 # Changing field 'Meeting.name'
19 db.alter_column('schedule_meeting', 'name', self.gf('summit.schedule.fields.NameField')(max_length=50))
20
21
22 models = {
23 'auth.group': {
24 'Meta': {'object_name': 'Group'},
25 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
26 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
27 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
28 },
29 'auth.permission': {
30 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
31 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
32 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
33 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
34 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
35 },
36 'auth.user': {
37 'Meta': {'object_name': 'User'},
38 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
39 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
40 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
41 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
42 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
43 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
44 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
45 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
46 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
47 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
48 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
49 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
50 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
51 },
52 'contenttypes.contenttype': {
53 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
54 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
55 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
56 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
57 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
58 },
59 'schedule.agenda': {
60 'Meta': {'ordering': "('slot', 'room')", 'unique_together': "(('slot', 'room'),)", 'object_name': 'Agenda'},
61 'auto': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
62 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
63 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}),
64 'room': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Room']"}),
65 'slot': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Slot']"})
66 },
67 'schedule.attendee': {
68 'Meta': {'ordering': "('summit', 'user')", 'object_name': 'Attendee'},
69 'crew': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_column': "'crew'"}),
70 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
71 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
72 'secret_key_id': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
73 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
74 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
75 'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Topic']", 'symmetrical': 'False', 'blank': 'True'}),
76 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
77 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
78 },
79 'schedule.attendeebusy': {
80 'Meta': {'ordering': "('attendee', 'start_utc', 'end_utc')", 'object_name': 'AttendeeBusy'},
81 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Attendee']"}),
82 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
83 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
84 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"})
85 },
86 'schedule.crew': {
87 'Meta': {'ordering': "('date_utc', 'attendee')", 'object_name': 'Crew'},
88 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'crew_schedule'", 'to': "orm['schedule.Attendee']"}),
89 'date_utc': ('django.db.models.fields.DateField', [], {'db_column': "'date'"}),
90 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
91 },
92 'schedule.lead': {
93 'Meta': {'ordering': "('summit', 'track')", 'object_name': 'Lead'},
94 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
95 'lead': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'lead'", 'to': "orm['schedule.Attendee']"}),
96 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
97 'track': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Track']"})
98 },
99 'schedule.meeting': {
100 'Meta': {'object_name': 'Meeting'},
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', 'blank': 'True'}),
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 'requires_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
112 'scribe': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scribe_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
113 'slots': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
114 'spec_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
115 'status': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
116 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
117 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
118 'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Topic']", 'symmetrical': 'False', 'blank': 'True'}),
119 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
120 'type': ('django.db.models.fields.CharField', [], {'default': "u'blueprint'", 'max_length': '15'}),
121 'video': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
122 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
123 },
124 'schedule.participant': {
125 'Meta': {'ordering': "('meeting', 'attendee', 'required')", 'object_name': 'Participant'},
126 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Attendee']"}),
127 'from_launchpad': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
128 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
129 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}),
130 'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
131 },
132 'schedule.room': {
133 'Meta': {'ordering': "('summit', 'name')", 'object_name': 'Room'},
134 'end_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'end'", 'blank': 'True'}),
135 'has_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
136 'icecast_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
137 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
138 'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
139 'size': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
140 'start_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'start'", 'blank': 'True'}),
141 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
142 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
143 'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
144 'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'})
145 },
146 'schedule.roombusy': {
147 'Meta': {'ordering': "('room', 'start_utc', 'end_utc')", 'object_name': 'RoomBusy'},
148 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
149 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
150 'room': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Room']"}),
151 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"})
152 },
153 'schedule.slot': {
154 'Meta': {'ordering': "('summit', 'start_utc', 'end_utc')", 'object_name': 'Slot'},
155 'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
156 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
157 'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
158 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
159 'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'})
160 },
161 'schedule.summit': {
162 'Meta': {'ordering': "('name',)", 'object_name': 'Summit'},
163 'date_end': ('django.db.models.fields.DateField', [], {'null': 'True'}),
164 'date_start': ('django.db.models.fields.DateField', [], {'null': 'True'}),
165 'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}),
166 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
167 'last_update': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
168 'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
169 'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
170 'state': ('django.db.models.fields.CharField', [], {'default': "u'sponsor'", 'max_length': '10'}),
171 'timezone': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
172 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
173 },
174 'schedule.summitsprint': {
175 'Meta': {'ordering': "('summit', 'import_url')", 'object_name': 'SummitSprint'},
176 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
177 'import_url': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
178 'summit': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sprint_set'", 'to': "orm['schedule.Summit']"})
179 },
180 'schedule.topic': {
181 'Meta': {'ordering': "('summit', 'title')", 'object_name': 'Topic'},
182 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
183 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
184 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
185 },
186 'schedule.track': {
187 'Meta': {'ordering': "('summit', 'title', 'slug')", 'object_name': 'Track'},
188 'allow_adjacent_sessions': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
189 'color': ('django.db.models.fields.CharField', [], {'default': "'FFFFFF'", 'max_length': '6'}),
190 'description': ('django.db.models.fields.TextField', [], {'max_length': '1000', 'null': 'True'}),
191 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
192 'slug': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
193 'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
194 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
195 }
196 }
197
198 complete_apps = ['schedule']
0199
=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py 2011-12-22 17:11:36 +0000
+++ summit/schedule/models/meetingmodel.py 2012-01-05 16:44:34 +0000
@@ -70,7 +70,7 @@
70 )70 )
7171
72 summit = models.ForeignKey(Summit)72 summit = models.ForeignKey(Summit)
73 name = NameField(max_length=50, blank=True)73 name = NameField(max_length=100, blank=True)
74 title = models.CharField(max_length=100)74 title = models.CharField(max_length=100)
75 description = models.TextField(max_length=2047, blank=True)75 description = models.TextField(max_length=2047, blank=True)
76 type = models.CharField(max_length=15, choices=TYPE_CHOICES,76 type = models.CharField(max_length=15, choices=TYPE_CHOICES,
7777
=== modified file 'summit/schedule/models/summitmodel.py'
--- summit/schedule/models/summitmodel.py 2011-12-04 15:49:32 +0000
+++ summit/schedule/models/summitmodel.py 2012-01-05 16:44:34 +0000
@@ -276,7 +276,7 @@
276 full_name = elem.get("name", "")276 full_name = elem.get("name", "")
277 if not full_name:277 if not full_name:
278 return278 return
279 name = full_name[:50]279 name = full_name[:100]
280280
281 print "meeting %s" % name281 print "meeting %s" % name
282 meeting = ""282 meeting = ""
283283
=== modified file 'summit/schedule/tests.py'
--- summit/schedule/tests.py 2011-11-30 17:46:39 +0000
+++ summit/schedule/tests.py 2012-01-05 16:44:34 +0000
@@ -1660,9 +1660,10 @@
16601660
1661 def test_update_meeting_trims_name(self):1661 def test_update_meeting_trims_name(self):
1662 summit = factory.make_one(Summit)1662 summit = factory.make_one(Summit)
1663 elem = LaunchpadExportNode(name="very" * 12 + "longname")1663 elem = LaunchpadExportNode(name="very " * 20 + "longname")
1664 meeting = summit.update_meeting_from_launchpad(elem)1664 meeting = summit.update_meeting_from_launchpad(elem)
1665 expected_name = "very" * 12 + "lo"1665 # Names are truncated at 100 chars.
1666 expected_name = "very " * 20
1666 self.assertEqual(expected_name, meeting.name)1667 self.assertEqual(expected_name, meeting.name)
1667 self.assertEqual(1, summit.meeting_set.filter(name__exact=expected_name).count())1668 self.assertEqual(1, summit.meeting_set.filter(name__exact=expected_name).count())
16681669

Subscribers

People subscribed via source and target branches