Merge lp:~mhall119/summit/videographer into lp:summit

[Michael Hall]

This comes from Daviey's older branch, with added South migration script

[Chris Johnston (cjohnston)]

I think it would be easier to have a dropdown instead of having to manually type in the LP name, however I do see that this has the same style as the rest of the fields.

[Chris Johnston (cjohnston)]

review: Approve

=== added file 'summit/media/img/videographer.png'
Binary files summit/media/img/videographer.png	1970-01-01 00:00:00 +0000 and summit/media/img/videographer.png	2011-04-02 01:05:50 +0000 differ
=== modified file 'summit/schedule/admin/meetingadmin.py'
--- summit/schedule/admin/meetingadmin.py	2010-03-05 10:33:36 +0000
+++ summit/schedule/admin/meetingadmin.py	2011-04-02 01:05:50 +0000
@@ -61,10 +61,13 @@
     assignee = forms.CharField(required=False, widget=AttendeeInput)
     approver = forms.CharField(required=False, widget=AttendeeInput)
     scribe = forms.CharField(required=False, widget=AttendeeInput)
+    videographer1 = forms.CharField(required=False, widget=AttendeeInput)
+    videographer2 = forms.CharField(required=False, widget=AttendeeInput)
 
     class Meta:
         model = Meeting
 
+    ### FIXME: Should really remove this duplication
     def clean_drafter(self):
         if 'drafter' in self.cleaned_data:
             data = self.cleaned_data['drafter']
@@ -114,6 +117,33 @@
                 raise forms.ValidationError("Username is invalid (doesn't exist or not an attendee).")
 
 
+
+    def clean_videographer1(self):
+        if 'videographer1' in self.cleaned_data:
+            data = self.cleaned_data['videographer1']
+            if len(data) == 0:
+                return None
+            try:
+                return Attendee.objects.get(
+                    summit=self.cleaned_data['summit'],
+                    user__username=data)
+            except Attendee.DoesNotExist:
+                raise forms.ValidationError("Username is invalid (doesn't exist or not an attendee).")
+
+
+    def clean_videographer2(self):
+        if 'videographer2' in self.cleaned_data:
+            data = self.cleaned_data['videographer2']
+            if len(data) == 0:
+                return None
+            try:
+                return Attendee.objects.get(
+                    summit=self.cleaned_data['summit'],
+                    user__username=data)
+            except Attendee.DoesNotExist:
+                raise forms.ValidationError("Username is invalid (doesn't exist or not an attendee).")
+
+
 class MeetingAdmin(admin.ModelAdmin):
     list_display = ('summit', 'name', 'title', 'type')
     list_display_links = ('name', 'title')
@@ -136,7 +166,7 @@
         }),
         ("Key people", {
             'classes': ('collapse', ),
-            'fields': ('drafter', 'assignee', 'approver', 'scribe'),
+            'fields': ('drafter', 'assignee', 'approver', 'scribe', 'videographer1' , 'videographer2'),
         }),
     )
 

=== modified file 'summit/schedule/fields.py'
--- summit/schedule/fields.py	2010-03-05 10:33:36 +0000
+++ summit/schedule/fields.py	2011-04-02 01:05:50 +0000
@@ -22,6 +22,10 @@
     'NameField',
 )
 
+# Let South 0.7 know abou this new field type
+from south.modelsinspector import add_introspection_rules
+add_introspection_rules([], ["^summit\.schedule\.fields\.NameField"])
+print "Added south field rule"
 
 class NameField(models.CharField):
 

=== added file 'summit/schedule/migrations/0005_add_videographers.py'
--- summit/schedule/migrations/0005_add_videographers.py	1970-01-01 00:00:00 +0000
+++ summit/schedule/migrations/0005_add_videographers.py	2011-04-02 01:05:50 +0000
@@ -0,0 +1,176 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+    
+    def forwards(self, orm):
+        
+        # Adding field 'Meeting.videographer2'
+        db.add_column('schedule_meeting', 'videographer2', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='videographer2_set', null=True, to=orm['schedule.Attendee']), keep_default=False)
+
+        # Adding field 'Meeting.videographer1'
+        db.add_column('schedule_meeting', 'videographer1', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='videographer1_set', null=True, to=orm['schedule.Attendee']), keep_default=False)
+    
+    
+    def backwards(self, orm):
+        
+        # Deleting field 'Meeting.videographer2'
+        db.delete_column('schedule_meeting', 'videographer2_id')
+
+        # Deleting field 'Meeting.videographer1'
+        db.delete_column('schedule_meeting', 'videographer1_id')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'schedule.agenda': {
+            'Meta': {'unique_together': "(('slot', 'room'),)", 'object_name': 'Agenda'},
+            'auto': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}),
+            'room': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Room']"}),
+            'slot': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Slot']"})
+        },
+        'schedule.attendee': {
+            'Meta': {'object_name': 'Attendee'},
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Topic']", 'symmetrical': 'False', 'blank': 'True'}),
+            'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'schedule.attendeebusy': {
+            'Meta': {'object_name': 'AttendeeBusy'},
+            'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Attendee']"}),
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"})
+        },
+        'schedule.meeting': {
+            'Meta': {'object_name': 'Meeting'},
+            'approver': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'approver_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
+            'assignee': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'assignee_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
+            'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}),
+            'drafter': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'drafter_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('summit.schedule.fields.NameField', [], {'max_length': '50', 'blank': 'True'}),
+            'participants': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Attendee']", 'symmetrical': 'False', 'through': "orm['schedule.Participant']", 'blank': 'True'}),
+            'priority': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'private': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'scribe': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scribe_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
+            'slots': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'spec_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Topic']", 'symmetrical': 'False', 'blank': 'True'}),
+            'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "u'blueprint'", 'max_length': '15'}),
+            'videographer1': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'videographer1_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
+            'videographer2': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'videographer2_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
+            'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
+        },
+        'schedule.participant': {
+            'Meta': {'object_name': 'Participant'},
+            'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Attendee']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'})
+        },
+        'schedule.room': {
+            'Meta': {'object_name': 'Room'},
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'end'", 'blank': 'True'}),
+            'icecast_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
+            'size': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'start'", 'blank': 'True'}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'})
+        },
+        'schedule.roombusy': {
+            'Meta': {'object_name': 'RoomBusy'},
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'room': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Room']"}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"})
+        },
+        'schedule.slot': {
+            'Meta': {'object_name': 'Slot'},
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'})
+        },
+        'schedule.summit': {
+            'Meta': {'object_name': 'Summit'},
+            'date_end': ('django.db.models.fields.DateField', [], {'null': 'True'}),
+            'date_start': ('django.db.models.fields.DateField', [], {'null': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_update': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
+            'state': ('django.db.models.fields.CharField', [], {'default': "u'sponsor'", 'max_length': '10'}),
+            'timezone': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'schedule.topic': {
+            'Meta': {'object_name': 'Topic'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'schedule.track': {
+            'Meta': {'object_name': 'Track'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+    
+    complete_apps = ['schedule']

=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py	2010-10-13 13:10:42 +0000
+++ summit/schedule/models/meetingmodel.py	2011-04-02 01:05:50 +0000
@@ -99,6 +99,10 @@
                                  related_name='approver_set')
     scribe = models.ForeignKey(Attendee, null=True, blank=True,
                                  related_name='scribe_set')
+    videographer1 = models.ForeignKey(Attendee, null=True, blank=True,
+                                 related_name='videographer1_set')
+    videographer2 = models.ForeignKey(Attendee, null=True, blank=True,
+                                 related_name='videographer2_set')
     participants = models.ManyToManyField(Attendee, blank=True,
                                           through='Participant')
 
@@ -123,6 +127,10 @@
         attendees = []
         if self.scribe and self.scribe not in attendees:
             attendees.append(self.scribe)
+        if self.videographer1 and self.videographer1 not in attendees:
+            attendees.append(self.videographer1)
+        if self.videographer2 and self.videographer2 not in attendees:
+            attendees.append(self.videographer2)
         if self.drafter:
             attendees.append(self.drafter)
         if self.assignee and self.assignee not in attendees:

=== modified file 'summit/schedule/render.py'
--- summit/schedule/render.py	2010-10-25 15:16:54 +0000
+++ summit/schedule/render.py	2011-04-02 01:05:50 +0000
@@ -761,6 +761,15 @@
                     html += (('<img src="%simg/scribe.png" title="Scribe" ' +
                               'alt="(scribe)" height="7" width="7"/>')
                              % settings.MEDIA_URL)
+                if attendee == meeting.videographer1:
+                    html += (('<img src="%simg/videographer.png" title="Videographer" ' +
+                              'alt="(videographer)" height="7" width="7"/>')
+                             % settings.MEDIA_URL)
+                if attendee == meeting.videographer2:
+                    html += (('<img src="%simg/videographer.png" title="Videographer" ' +
+                              'alt="(videographer)" height="7" width="7"/>')
+                             % settings.MEDIA_URL)
+
                 try:
                     participant = meeting.participant_set.get(attendee=attendee)
                 except: