Skip to content

Commit 6d400d6

Browse files
committed
Fix missing role.email -> role.person query
- Legacy-Id: 3427
1 parent 022bc51 commit 6d400d6

5 files changed

Lines changed: 21 additions & 1 deletion

File tree

redesign/importing/import-all.sh

100644100755
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
#!/bin/bash
2+
13
# basic dependencies
4+
set -e
25
python import-persons.py
36
python import-groups.py
47
python import-roles.py

redesign/importing/import-announcements.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181

8282
if o.nomcom:
8383
nomcom = Group.objects.filter(role__name="chair",
84-
role__email__person=old_person_to_person(o.nomcom_chair.person),
84+
role__person=old_person_to_person(o.nomcom_chair.person),
8585
acronym__startswith="nomcom").exclude(acronym="nomcom").get()
8686

8787
message.related_groups.add(nomcom)

redesign/importing/import-groups.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,14 @@
8181
rsoc_group.type = type_names["ietf"]
8282
rsoc_group.save()
8383

84+
# create IAB for use with liaison statements
85+
iab_group, _ = Group.objects.get_or_create(acronym="iab")
86+
iab_group.name = "Internet Architecture Board"
87+
iab_group.state = state_names["active"]
88+
iab_group.type = type_names["ietf"]
89+
iab_group.save()
90+
91+
8492
system = Person.objects.get(name="(System)")
8593

8694

redesign/importing/import-meetings.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,8 @@ def get_timeslot(attr):
289289
s.attendees = o.number_attendee
290290
s.agenda_note = (o.special_agenda_note or "").strip()
291291
s.requested = o.requested_date or obviously_bogus_date
292+
print o.requested_by_id
293+
print o.requested_by
292294
s.requested_by = old_person_to_person(o.requested_by) if o.requested_by else system_person
293295
s.requested_duration = requested_length_mapping[getattr(o, "length_session%s" % i)]
294296
s.comments = (o.special_req or "").strip()

redesign/importing/utils.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,13 @@ def get_or_create_email(o, create_fake):
9393

9494
e.person = p
9595
e.save()
96+
else:
97+
if e.person.name != name:
98+
Alias.objects.create(name=name, person=e.person)
99+
# take longest name rather than the first we encounter
100+
if len(name) > e.person.name:
101+
e.person.name = name
102+
e.person.save()
96103

97104
return e
98105

0 commit comments

Comments
 (0)