From 525ad030abb5ebd153447dd20c89ffc02071cfed Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Mon, 4 May 2015 13:09:41 +0000 Subject: [PATCH] some tweaks to the history - Legacy-Id: 9597 --- ietf/meeting/migrations/0006_auto_20150318_1116.py | 9 ++++++--- ietf/meeting/migrations/0011_ietf92_meetings.py | 10 +++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ietf/meeting/migrations/0006_auto_20150318_1116.py b/ietf/meeting/migrations/0006_auto_20150318_1116.py index b61bb3c8c..1049d26d9 100644 --- a/ietf/meeting/migrations/0006_auto_20150318_1116.py +++ b/ietf/meeting/migrations/0006_auto_20150318_1116.py @@ -60,7 +60,8 @@ def backfill_91_other_meetings(apps, schema_editor): ( 9, 9, 0, 360, 'offagenda', [secr], hibiscus, 'Meeting', 'RootOPS'), ( 9, 9, 30, 360, 'offagenda', [secr], kahili, 'TLS Interim', 'TLS WG Interim'), ( 9, 11, 0, 480, 'offagenda', [secr], coral_lounge, 'T-Shirt Distribution', 'T-shirt Distribution'), - ( 9, 11, 30, 150, 'lead', [iesg,iab], south_pacific_2, 'Lunch', 'IAB/IESG Lunch'), + ( 9, 11, 30, 150, 'lead', [iesg], south_pacific_2, 'Lunch', 'IESG Lunch with the IAB'), + ( 9, 11, 30, 150, 'lead', [iab], south_pacific_2, 'Lunch', 'IAB Lunch with the IESG'), ( 9, 12, 0, 360, 'offagenda', [secr], south_pacific_1, 'Terminal Room', 'Terminal Room Open to Attendees'), ( 9, 14, 0, 180, 'lead', [iab], south_pacific_2, 'Meeting', None), ( 9, 16, 0, 120, 'offagenda', [secr], coral_2, 'Meeting', 'Web Object Encryption'), @@ -69,7 +70,8 @@ def backfill_91_other_meetings(apps, schema_editor): ( 9, 19, 0, 180, 'offagenda', [secr], lehua_suite, 'Meeting', 'Huawei'), ( 9, 21, 0, 180, 'lead', [secr], sea_pearl_12, 'Gathering', 'AMS/IESG/IAB/IAOC Gathering'), ( 10, 0, 0, 1440, 'offagenda', [secr], south_pacific_1, 'Terminal Room', 'Terminal Room Open to Attendees'), - ( 10, 7, 0, 120, 'lead', [iesg,iab], south_pacific_2, 'Breakfast', 'IESG/IAB Breakfast'), + ( 10, 7, 0, 120, 'lead', [iesg], south_pacific_2, 'Breakfast', 'IESG Breakfast with the IAB'), + ( 10, 7, 0, 120, 'lead', [iab], south_pacific_2, 'Breakfast', 'IAB Breakfast with the IESG'), ( 10, 7, 0, 120, 'lead', [nomcom], iolani_67, 'Breakfast', 'Nomcom Breakfast'), ( 10, 8, 0, 600, 'offagenda', [secr], coral_lounge, 'T-shirt Distribution', 'T-shirt Distribution'), ( 10, 11, 30, 90, 'offagenda', [secr], south_pacific_2, 'Meeting', 'OPS Directorate Meeting'), @@ -103,7 +105,8 @@ def backfill_91_other_meetings(apps, schema_editor): ( 14, 0, 0, 900, 'offagenda', [secr], south_pacific_1, 'Terminal Room', 'Terminal Room Open to Attendees'), ( 14, 7, 0, 120, 'lead', [nomcom], iolani_67, 'Breakfast', 'Nomcom Breakfast'), ( 14, 11, 0, 360, 'offagenda', [isoc], south_pacific_34,'Meeeting', 'ISOC AC Meeting'), - ( 14, 13, 30, 90, 'lead', [iesg,iab], south_pacific_2, 'Lunch', 'IESG/IAB Lunch'), + ( 14, 13, 30, 90, 'lead', [iesg], south_pacific_2, 'Lunch', 'IESG Lunch with the IAB'), + ( 14, 13, 30, 90, 'lead', [iab], south_pacific_2, 'Lunch', 'IAB Lunch with the IESG'), ( 14, 18, 0, 60, 'offagenda', [isocbot], rainbow_23, 'Reception', 'ISOC Board Reception for IETF Leadership'), ( 14, 19, 0, 180, 'offagenda', [isocbot], rainbow_23, 'Dinner', 'ISOC Board Dinner for IETF Leadership'), ( 15, 8, 0, 60, 'offagenda', [isocbot], rainbow_12, 'Breakfast', 'ISOC Board of Trustees Breakfast'), diff --git a/ietf/meeting/migrations/0011_ietf92_meetings.py b/ietf/meeting/migrations/0011_ietf92_meetings.py index 7d61d205a..20b20caa6 100644 --- a/ietf/meeting/migrations/0011_ietf92_meetings.py +++ b/ietf/meeting/migrations/0011_ietf92_meetings.py @@ -103,7 +103,8 @@ def backfill_92_other_meetings(apps, schema_editor): ( 22, 19, 0, 120, 'offagenda', [iab], florentine, 'Meeting', 'IAB PrivSec program'), ( 22, 8, 30, 90, 'lead', [iesg], pavilion, 'Breakfast', None), ( 22, 9, 0, 150, 'lead', [iesg], pavilion, 'Meeting', None), - ( 22, 11, 30, 150, 'lead', [iab,iesg], pavilion, 'Lunch', 'IESG/IAB Lunch'), + ( 22, 11, 30, 150, 'lead', [iab], pavilion, 'Lunch', 'IAB Lunch with the IESG'), + ( 22, 11, 30, 150, 'lead', [iesg], pavilion, 'Lunch', 'IESG Lunch with the IAB'), ( 22, 14, 0, 180, 'lead', [iab], pavilion, 'Meeting', None), ( 22, 9, 0, 480, 'offagenda', [secr], terrace, 'Meeting', 'RootOPS'), ( 22, 16, 30, 60, 'offagenda', [secr], panorama, 'Reception', "Companion's Reception"), # Should this appear on agenda? @@ -117,7 +118,8 @@ def backfill_92_other_meetings(apps, schema_editor): ( 23, 8, 0, 600, 'offagenda', [secr], regency_foyer, 'T-Shirt Distribution', 'T-shirt Distribution'), ( 23, 0, 0, 1440, 'offagenda', [secr], regency, 'Lounge', 'Lounge'), ( 23, 11, 30, 180, 'offagenda', [secr], executive, 'Lunch', 'ICANN Lunch'), - ( 23, 7, 0, 120, 'lead', [iab,iesg], pavilion, 'Breakfast', 'IESG/IAB Breakfast'), + ( 23, 7, 0, 120, 'lead', [iesg], pavilion, 'Breakfast', 'IESG Breakfast with the IAB'), + ( 23, 7, 0, 120, 'lead', [iab], pavilion, 'Breakfast', 'IAB Breakfast with the IESG'), ( 23, 11, 30, 90, 'offagenda', [secr], pavilion, 'Meeting', 'OPS Directorate Meeting'), ( 23, 19, 0, 120, 'offagenda', [secr], pavilion, 'Meeting', 'ACE'), ( 23, 7, 30, 90, 'offagenda', [secr], terrace, 'Meeting', 'NRO ECG'), @@ -162,7 +164,9 @@ def backfill_92_other_meetings(apps, schema_editor): ( 26, 19, 30, 150, 'offagenda', [secr], royal, 'Meeting', 'Lavabit'), ( 27, 0, 0, 900, 'offagenda', [secr], brasserie, 'Terminal Room', 'Terminal Room Open to Attendees'), ( 27, 7, 30, 90, 'offagenda', [secr], executive, 'Meeting', 'Post-Con with Ray'), - ( 27, 13, 30, 90, 'lead', [iab,iesg], pavilion, 'Lunch', 'IESG/IAB Lunch'), + ( 27, 7, 30, 75, 'offagenda', [secr], state, 'Breakfast', 'Gen-art'), + ( 27, 13, 30, 90, 'lead', [iab], pavilion, 'Lunch', 'IAB Lunch with the IESG'), + ( 27, 13, 30, 90, 'lead', [iesg], pavilion, 'Lunch', 'IESG Lunch with the IAB'), ]: ts = ietf92.timeslot_set.create(type_id=type_id, name=slotname,