Merge lp:~mhall119/summit/menu-fixes into lp:~cjohnston/summit/menu-fixes

[Chris Johnston]

=== modified file 'summit/common/management/commands/lpupdate.py'
--- summit/common/management/commands/lpupdate.py	2012-02-25 00:13:45 +0000
+++ summit/common/management/commands/lpupdate.py	2012-10-03 21:15:28 +0000
@@ -17,6 +17,7 @@
 from django.core.management.base import BaseCommand, CommandError
 
 from summit.schedule.models import Summit
+from optparse import make_option
 
 __all__ = (
     'Command',
@@ -24,16 +25,24 @@
 
 
 class Command(BaseCommand):
+    option_list = BaseCommand.option_list + (
+        make_option("-s", "--slots", dest="slots",
+            help="Number of slots an imported meeting needs", type=int, default=1),
+        make_option("-A", "--no-attendees", dest="skip_attendees", action="store_true",
+            help="Don't import Attendee data", default=False),
+        make_option("-M", "--no-meetings", dest="skip_meetings", action="store_true",
+            help="Don't import Meeting data", default=False),
+    )
 
     def handle(self, summit='', *args, **options):
         if not summit:
             for summit in Summit.objects.all():
                 print "Updating %s" % summit
-                summit.update_from_launchpad()
+                summit.update_from_launchpad(options)
         else:
             try:
                 summit = Summit.objects.get(name=summit)
             except Summit.DoesNotExist:
                 raise CommandError("Summit doesn't exist: %s" % summit)
             print "Updating %s" % summit
-            summit.update_from_launchpad()
+            summit.update_from_launchpad(options)

=== modified file 'summit/common/templatetags/menubuilder.py'
--- summit/common/templatetags/menubuilder.py	2012-10-03 21:01:17 +0000
+++ summit/common/templatetags/menubuilder.py	2012-10-03 21:15:28 +0000
@@ -70,6 +70,7 @@
         menuitems = []
         
     try:
+<<<<<<< TREE
         menu = Menu.objects.get(slug=menu_name)
     except Menu.DoesNotExist:
         return []
@@ -85,6 +86,18 @@
 
     if cache_time >= 0 and not debug:
         cache.set(cache_key, menuitems, cache_time)
+=======
+        menu_instance = Menu.objects.get(slug=menu)
+        base_path = menu_instance.base_url or ''
+        for i in MenuItem.objects.filter(menu=menu_instance).order_by('order'):
+            current = ( i.link_url != '/' and current_path == (base_path + i.link_url)) or ( i.link_url == '/' and current_path == '/' )
+            if not i.login_required or ( i.login_required and user.is_authenticated() ):
+                menuitems.append({'url': i.link_url, 'title': i.title, 'current': current,})
+    except Menu.DoesNotExist:
+        pass# No Menu by this name, fail gracefully
+    except MenuItem.DoesNotExist:
+        pass# No Menu by this name, fail gracefully
+>>>>>>> MERGE-SOURCE
     return menuitems
 
 register.tag('menu', build_menu)

=== modified file 'summit/common/tests.py'
--- summit/common/tests.py	2012-10-03 21:01:17 +0000
+++ summit/common/tests.py	2012-10-03 21:15:28 +0000
@@ -44,6 +44,7 @@
         
     def test_toplevel_menu_highlights(self):
         schedule_page = self.client.get('/uds-test/')
+<<<<<<< TREE
         print schedule_page.content
         self.assertContains(schedule_page, 
             '<li class=\'active\' id="main-nav"><a class="main-nav-item" href="/uds-test/" title="Schedule">Schedule</a>', 1)
@@ -53,6 +54,16 @@
             '<li class=\'active\' id="main-nav"><a class="main-nav-item" href="/today/uds-test/" title="Today">Today</a>', 0)
         self.assertContains(schedule_page, 
             '<li id="main-nav"><a class="main-nav-item" href="/today/uds-test/" title="Today">Today</a>', 1)
+=======
+        self.assertContains(schedule_page, 
+            '<li class=\'active\' id="main-nav"><a class="main-nav-item" href="/uds-test/" title="Schedule">Schedule</a>', 1)
+        self.assertContains(schedule_page, 
+            '<li id="main-nav"><a class="main-nav-item" href="/uds-test/" title="Schedule">Schedule</a>', 0)
+        self.assertContains(schedule_page, 
+            '<li class=\'active\' id="main-nav"><a class="main-nav-item" href="/today/uds-test/" title="Today">Today</a>', 0)
+        self.assertContains(schedule_page, 
+            '<li id="main-nav"><a class="main-nav-item" href="/today/uds-test/" title="Today">Today</a>', 1)
+>>>>>>> MERGE-SOURCE
 
     def test_sublevel_menu_highlights(self):
         today_page = self.client.get('/today/uds-test/')

=== modified file 'summit/schedule/admin/meetingadmin.py'
--- summit/schedule/admin/meetingadmin.py	2012-05-16 14:59:59 +0000
+++ summit/schedule/admin/meetingadmin.py	2012-10-03 21:15:28 +0000
@@ -144,7 +144,7 @@
                        'type', 'tracks', 'requires_dial_in', 'video'),
         }),
         ("References", {
-            'fields': ('spec_url', 'wiki_url', 'pad_url'),
+            'fields': ('spec_url', 'launchpad_blueprint_id', 'wiki_url', 'pad_url'),
         }),
         ("Scheduling details", {
             'classes': ('collapse', ),

=== modified file 'summit/schedule/management/commands/initslots.py'
--- summit/schedule/management/commands/initslots.py	2012-03-08 22:19:17 +0000
+++ summit/schedule/management/commands/initslots.py	2012-10-03 21:15:28 +0000
@@ -58,6 +58,9 @@
         duration = datetime.timedelta(minutes=options["duration"])
         interval = datetime.timedelta(minutes=options["interval"])
         breaktime = datetime.timedelta(minutes=15)
+        
+        slots_per_hour = (60 * 60) / duration.seconds
+
         try:
             summit = Summit.objects.get(name=summit.__str__)
         except Summit.DoesNotExist:
@@ -77,14 +80,19 @@
                 # Determines the type of the session
                 if slottime.time() == lunch:
                     slot_type = 'lunch'
+                    slot_duration = datetime.timedelta(minutes=60)
+                    slot_count += (slots_per_hour - 1)
                 elif slottime.time() == plenary:
                     slot_type = 'plenary'
+                    slot_duration = datetime.timedelta(minutes=60)
+                    slot_count += (slots_per_hour - 1)
                 else:
                     slot_type = 'open'
-                slot_length = duration
+                    slot_duration = duration
+                slot_length = slot_duration
 
                 # Morning Break
-                if slot_count == 2:
+                if slot_count == (2 * slots_per_hour):
                     slot, created = Slot.objects.get_or_create(
                         summit=summit,
                         start_utc=start_time + slot_length - breaktime,
@@ -93,7 +101,7 @@
                     )
                     slot_length = slot_length - breaktime
                 # Afternoon Break
-                elif slot_count == 8:
+                elif slot_count == (7 * slots_per_hour)+1:
                     slot, created = Slot.objects.get_or_create(
                         summit=summit,
                         start_utc=start_time,
@@ -105,10 +113,10 @@
                     slottime = slottime + interval
                 # Non-break intervals
                 elif slot_type == 'open':
-                    nexthour = slottime + hour
+                    nexthour = slottime + duration
                     if nexthour.time() != lunch \
                     and nexthour.time() != plenary \
-                    and slot_count != 7:
+                    and slot_count != (7*slots_per_hour):
                         slot_length = slot_length - interval
 
                 end_time = start_time + slot_length
@@ -120,7 +128,7 @@
                     end_utc=end_time,
                     type=slot_type)
 
-                slottime = slottime + duration
+                slottime = slottime + slot_duration
 
             date = date + day
         print "Initializing slots complete."

=== added file 'summit/schedule/migrations/0025_add_meeting_blueprint_id.py'
--- summit/schedule/migrations/0025_add_meeting_blueprint_id.py	1970-01-01 00:00:00 +0000
+++ summit/schedule/migrations/0025_add_meeting_blueprint_id.py	2012-10-03 21:15:28 +0000
@@ -0,0 +1,207 @@
+# 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.launchpad_blueprint_id'
+        db.add_column('schedule_meeting', 'launchpad_blueprint_id', self.gf('django.db.models.fields.IntegerField')(null=True, blank=True), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'Meeting.launchpad_blueprint_id'
+        db.delete_column('schedule_meeting', 'launchpad_blueprint_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': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", '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': {'ordering': "['username']", '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'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            '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': {'ordering': "('name',)", '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': {'ordering': "('slot', 'room')", 'unique_together': "(('slot', 'room'),)", 'object_name': 'Agenda'},
+            'auto': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            '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': {'ordering': "('user__username', 'summit')", 'object_name': 'Attendee'},
+            'crew': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_column': "'crew'"}),
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'secret_key_id': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            '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': {'ordering': "('attendee', 'start_utc', 'end_utc')", '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.crew': {
+            'Meta': {'ordering': "('date_utc', 'attendee')", 'object_name': 'Crew'},
+            'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'crew_schedule'", 'to': "orm['schedule.Attendee']"}),
+            'date_utc': ('django.db.models.fields.DateField', [], {'db_column': "'date'"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'schedule.lead': {
+            'Meta': {'ordering': "('summit', 'track')", 'object_name': 'Lead'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lead': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'lead'", 'to': "orm['schedule.Attendee']"}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'track': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Track']"})
+        },
+        'schedule.meeting': {
+            'Meta': {'object_name': 'Meeting'},
+            'approved': ('django.db.models.fields.CharField', [], {'default': "'PENDING'", 'max_length': '10', 'null': 'True'}),
+            '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'}),
+            'launchpad_blueprint_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('summit.schedule.fields.NameField', [], {'max_length': '100'}),
+            'override_break': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'pad_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', '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'}),
+            'private_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'requires_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            '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'}),
+            'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "u'discussion'", 'max_length': '15'}),
+            'video': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
+        },
+        'schedule.participant': {
+            'Meta': {'ordering': "('meeting', 'attendee', 'participation')", 'object_name': 'Participant'},
+            'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Attendee']"}),
+            'from_launchpad': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}),
+            'participation': ('django.db.models.fields.CharField', [], {'default': "'ATTENDING'", 'max_length': '32', 'null': 'True'})
+        },
+        'schedule.room': {
+            'Meta': {'ordering': "('summit', 'name')", 'object_name': 'Room'},
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'end'", 'blank': 'True'}),
+            'has_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'icecast_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'irc_channel': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': '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': {'ordering': "('room', 'start_utc', 'end_utc')", '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': {'ordering': "('summit', 'start_utc', 'end_utc')", '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': {'ordering': "('name',)", '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'}),
+            'etherpad': ('django.db.models.fields.URLField', [], {'default': "'http://pad.ubuntu.com/'", 'max_length': '75'}),
+            'hashtag': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
+            'help_text': ('django.db.models.fields.TextField', [], {'null': 'True', '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'}),
+            'managers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'managers'", 'blank': 'True', 'to': "orm['auth.User']"}),
+            'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
+            'qr': ('django.db.models.fields.URLField', [], {'default': "''", 'max_length': '100', 'blank': 'True'}),
+            'schedulers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'schedulers'", 'blank': 'True', 'to': "orm['auth.User']"}),
+            'sites': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['sites.Site']", 'symmetrical': 'False'}),
+            '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.summitsprint': {
+            'Meta': {'ordering': "('summit', 'import_url')", 'object_name': 'SummitSprint'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'import_url': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sprint_set'", 'to': "orm['schedule.Summit']"})
+        },
+        'schedule.track': {
+            'Meta': {'ordering': "('summit', 'title', 'slug')", 'object_name': 'Track'},
+            'allow_adjacent_sessions': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'color': ('django.db.models.fields.CharField', [], {'default': "'FFFFFF'", 'max_length': '6'}),
+            'description': ('django.db.models.fields.TextField', [], {'max_length': '1000', 'null': 'True'}),
+            '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'})
+        },
+        'sites.site': {
+            'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"},
+            'domain': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        }
+    }
+
+    complete_apps = ['schedule']

=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py	2012-07-14 20:19:27 +0000
+++ summit/schedule/models/meetingmodel.py	2012-10-03 21:15:28 +0000
@@ -74,6 +74,7 @@
         (u'PENDING', u'Pending'),
         (u'APPROVED', u'Approved'),
         (u'DECLINED', u'Declined'),
+        (u'REMOVED', u'Removed'),
     )
 
     summit = models.ForeignKey(Summit)
@@ -118,6 +119,7 @@
                                  related_name='scribe_set')
     participants = models.ManyToManyField(Attendee, blank=True,
                                           through='Participant')
+    launchpad_blueprint_id = models.IntegerField(blank=True, null=True)
 
     class Meta:
         app_label = 'schedule'
@@ -296,6 +298,12 @@
 
         self.approved = 'APPROVED'
         
+        name = elem.get("name")
+        if name:
+            self.name = name[:100]
+        else:
+            self.name = None
+
         status = elem.get("status")
         if status:
             self.status = status

=== modified file 'summit/schedule/models/summitmodel.py'
--- summit/schedule/models/summitmodel.py	2012-08-09 15:53:51 +0000
+++ summit/schedule/models/summitmodel.py	2012-10-03 21:15:28 +0000
@@ -233,14 +233,16 @@
                    % self.name)]
         return urls
 
-    def update_from_launchpad_response(self, response):
+    def update_from_launchpad_response(self, response, options={}):
         meetings = set()
-        for elem in response.find("attendees").findall("person"):
-            self.update_attendee_from_launchpad(elem)
-        for elem in response.find("unscheduled").findall("meeting"):
-            meeting = self.update_meeting_from_launchpad(elem)
-            if meeting is not None:
-                meetings.add(meeting)
+        if not options.get('skip_attendees', False):
+            for elem in response.find("attendees").findall("person"):
+                self.update_attendee_from_launchpad(elem, options)
+        if not options.get('skip_meetings', False):
+            for elem in response.find("unscheduled").findall("meeting"):
+                meeting = self.update_meeting_from_launchpad(elem, options)
+                if meeting is not None:
+                    meetings.add(meeting)
         return meetings
 
     def _get_sprint_info_from_launchpad(self, url):
@@ -264,26 +266,33 @@
         sprint_info = ElementTree.parse(export)
         return sprint_info
 
-    def update_from_launchpad(self):
+    def update_from_launchpad(self, options={}):
         """Update from Launchpad data."""
         in_lp = set()
         urls = self.launchpad_sprint_import_urls()
         for url in urls:
             print "Importing from %s" % url
             sprint_info = self._get_sprint_info_from_launchpad(url)
-            in_lp |= self.update_from_launchpad_response(sprint_info)
-
+            in_lp |= self.update_from_launchpad_response(sprint_info, options)
+
+        in_db = set(m for m in self.meeting_set.exclude(launchpad_blueprint_id__isnull=True))
+
+        for extra in in_db.difference(in_lp):
+            if not len(extra.agenda_set.all()):
+                print "will delete %s" % extra.name
+                extra.approved='REMOVED'
+                extra.save()
         self.last_update = datetime.utcnow()
         self.save()
 
-    def update_attendee_from_launchpad(self, elem):
+    def update_attendee_from_launchpad(self, elem, options={}):
         """Update or create single attendee from Launchpad data."""
+        
         username = elem.get("name", "")
         if not username:
             return
 
         print "user %s" % username
-
         try:
             attendee = self.attendee_set.get(user__username__exact=username[:30])
         except ObjectDoesNotExist:
@@ -298,10 +307,15 @@
                                                 start=datetime.utcnow(),
                                                 end=datetime.utcnow())
 
+
         attendee.update_from_launchpad(elem)
 
-    def update_meeting_from_launchpad(self, elem):
+    def update_meeting_from_launchpad(self, elem, options={}):
         """Update or create single meeting from Launchpad data."""
+        bp_id = elem.get("id", None)
+        if not bp_id:
+            return
+
         full_name = elem.get("name", "")
         if not full_name:
             return
@@ -309,10 +323,13 @@
 
         print "meeting %s" % name
         meeting = ""
+
+        slot_length = options.get('slots', 1)
+
         try:
-            meeting = self.meeting_set.get(name__exact=name)
+            meeting = self.meeting_set.get(launchpad_blueprint_id=bp_id)
         except ObjectDoesNotExist:
-            meeting = self.meeting_set.create(name=name, title=full_name[:100])
+            meeting = self.meeting_set.create(name=name, title=full_name[:100], slots=slot_length, launchpad_blueprint_id=bp_id)
         except:
             pass
 

=== modified file 'summit/schedule/tests.py'
--- summit/schedule/tests.py	2012-09-09 21:15:17 +0000
+++ summit/schedule/tests.py	2012-10-03 21:15:28 +0000
@@ -1667,7 +1667,7 @@
 
     def test_update_meeting_trims_name(self):
         summit = factory.make_one(Summit)
-        elem = LaunchpadExportNode(name="very " * 20 + "longname")
+        elem = LaunchpadExportNode(name="very " * 20 + "longname", id="42")
         meeting = summit.update_meeting_from_launchpad(elem)
         # Names are truncated at 100 chars.
         expected_name = "very " * 20
@@ -1678,7 +1678,7 @@
         summit = factory.make_one(Summit)
         name = "meeting-name"
         title = "other-title"
-        elem = LaunchpadExportNode(name=name)
+        elem = LaunchpadExportNode(name=name, id="42")
         summit.meeting_set.create(name=name, title=title)
         meeting = summit.update_meeting_from_launchpad(elem)
         self.assertEqual(name, meeting.name)
@@ -1695,7 +1695,7 @@
     def test_update_from_launchpad_response_handles_no_name(self):
         summit = factory.make_one(Summit)
         elem = self.get_basic_launchpad_response()
-        meeting_node = LaunchpadExportNode(name=None)
+        meeting_node = LaunchpadExportNode(name=None, id="42")
         elem.find("unscheduled").add_child("meeting", meeting_node)
         meetings = summit.update_from_launchpad_response(elem)
         self.assertEqual(set(), meetings)
@@ -1738,16 +1738,30 @@
         summit = factory.make_one(Summit)
         def get_sprint_info(url):
             elem = self.get_basic_launchpad_response()
-            meeting_node = LaunchpadExportNode(name="foo")
+            meeting_node = LaunchpadExportNode(name="foo", id="42")
             elem.find("unscheduled").add_child("meeting", meeting_node)
             return elem
         summit._get_sprint_info_from_launchpad = get_sprint_info
         summit.update_from_launchpad()
         self.assertEqual(1, summit.meeting_set.all().count())
 
+    def test_update_from_launchpad_does_renames(self):
+        summit = factory.make_one(Summit)
+        meeting = summit.meeting_set.create(name="name", launchpad_blueprint_id="42")
+        def get_sprint_info(url):
+            elem = self.get_basic_launchpad_response()
+            meeting_node = LaunchpadExportNode(name="other", id="42")
+            elem.find("unscheduled").add_child("meeting", meeting_node)
+            return elem
+        summit._get_sprint_info_from_launchpad = get_sprint_info
+        summit.update_from_launchpad()
+        # Since both had blueprint id 42, it should just update the existing meeting
+        self.assertEqual(0, summit.meeting_set.filter(name__exact="name").count())
+        self.assertEqual(1, summit.meeting_set.filter(name__exact="other").count())
+
     def test_update_from_launchpad_deletes_unseen_meetings(self):
         summit = factory.make_one(Summit)
-        meeting = summit.meeting_set.create(spec_url='test_url', name="name")
+        meeting = summit.meeting_set.create(spec_url='test_url', name="name", launchpad_blueprint_id="42")
         def get_sprint_info(url):
             elem = self.get_basic_launchpad_response()
             meeting_node = LaunchpadExportNode(name="other")
@@ -1755,14 +1769,27 @@
             return elem
         summit._get_sprint_info_from_launchpad = get_sprint_info
         summit.update_from_launchpad()
-        self.assertEqual(0, summit.meeting_set.filter(name__exact="name").count())
+        self.assertEqual(1, summit.meeting_set.filter(name__exact="name").count())
+        self.assertEqual(0, summit.meeting_set.filter(name__exact="name").exclude(approved='REMOVED').count())
+
+    def test_update_from_launchpad_doesnt_delete_meetings_with_spec_url(self):
+        summit = factory.make_one(Summit)
+        meeting = summit.meeting_set.create(spec_url='http://example.com/foo', name="name", launchpad_blueprint_id="42")
+        def get_sprint_info(url):
+            elem = self.get_basic_launchpad_response()
+            meeting_node = LaunchpadExportNode(name="other", id="43")
+            elem.find("unscheduled").add_child("meeting", meeting_node)
+            return elem
+        summit._get_sprint_info_from_launchpad = get_sprint_info
+        summit.update_from_launchpad()
+        self.assertEqual(1, summit.meeting_set.filter(name__exact="name").count())
 
     def test_update_from_launchpad_doesnt_delete_meetings_with_no_spec_url(self):
         summit = factory.make_one(Summit)
-        meeting = summit.meeting_set.create(spec_url='', name="name")
+        meeting = summit.meeting_set.create(spec_url='', name="name", launchpad_blueprint_id="42")
         def get_sprint_info(url):
             elem = self.get_basic_launchpad_response()
-            meeting_node = LaunchpadExportNode(name="other")
+            meeting_node = LaunchpadExportNode(name="other", id="43")
             elem.find("unscheduled").add_child("meeting", meeting_node)
             return elem
         summit._get_sprint_info_from_launchpad = get_sprint_info