Skip to content

Commit 9b4415f

Browse files
committed
Fix problem with direct replyto path in liaison form not using role
emails (reported by Stephanie McCammon). - Legacy-Id: 4310
1 parent b418e5d commit 9b4415f

1 file changed

Lines changed: 17 additions & 1 deletion

File tree

ietf/liaisons/formsREDESIGN.py

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from ietf.liaisons.models import LiaisonStatement, LiaisonStatementPurposeName
1717
from ietf.liaisons.proxy import LiaisonDetailProxy
1818
from ietf.group.models import Group
19-
from ietf.person.models import Person
19+
from ietf.person.models import Person, Email
2020
from ietf.doc.models import Document
2121

2222

@@ -313,6 +313,14 @@ def set_from_field(self):
313313
self.fields['from_field'].choices = [('sdo_%s' % i.pk, i.name) for i in sdos.order_by("name")]
314314
self.fields['from_field'].widget.submitter = unicode(self.person)
315315

316+
def set_replyto_field(self):
317+
e = Email.objects.filter(person=self.person, role__group__state="active", role__name__in=["liaiman", "auth"])
318+
if e:
319+
addr = e[0].address
320+
else:
321+
addr = self.person.email_address()
322+
self.fields['replyto'].initial = addr
323+
316324
def set_organization_field(self):
317325
self.fields['organization'].choices = self.hm.get_all_incoming_entities()
318326

@@ -360,6 +368,14 @@ def set_from_field(self):
360368
self.fields['from_field'].widget.submitter = unicode(self.person)
361369
self.fieldsets[0] = ('From', ('from_field', 'replyto', 'approved'))
362370

371+
def set_replyto_field(self):
372+
e = Email.objects.filter(person=self.person, role__group__state="active", role__name__in=["ad", "chair"])
373+
if e:
374+
addr = e[0].address
375+
else:
376+
addr = self.person.email_address()
377+
self.fields['replyto'].initial = addr
378+
363379
def set_organization_field(self):
364380
# If the user is a liaison manager and is nothing more, reduce the To field to his SDOs
365381
if not self.hm.get_entities_for_person(self.person) and is_sdo_liaison_manager(self.person):

0 commit comments

Comments
 (0)