@@ -580,25 +580,14 @@ def login(request, extra_context=None):
580580 which is not recognized as a valid password hash.
581581 """
582582
583+ require_consent = []
583584 if request .method == "POST" :
584585 form = AuthenticationForm (request , data = request .POST )
585586 username = form .data .get ('username' )
586587 user = User .objects .filter (username = username ).first ()
587588 #
588- require_consent = []
589589 if user .person and not user .person .consent :
590- person = user .person
591- if person .name != person .name_from_draft :
592- require_consent .append ("full name" )
593- if person .ascii != person .name_from_draft :
594- require_consent .append ("ascii name" )
595- if person .biography :
596- require_consent .append ("biography" )
597- if user .communitylist_set .exists ():
598- require_consent .append ("draft notification subscription(s)" )
599- for email in person .email_set .all ():
600- if not email .origin .split (':' )[0 ] in ['author' , 'role' , 'reviewer' , 'liaison' , 'shepherd' , ]:
601- require_consent .append ("email address(es)" )
590+ require_consent = user .person .needs_consent ()
602591 if user :
603592 try :
604593 identify_hasher (user .password )
@@ -617,8 +606,10 @@ def login(request, extra_context=None):
617606 You have personal information associated with your account which is not
618607 derived from draft submissions or other ietf work, namely: %s. Please go
619608 to your <a href='/accounts/profile'>account profile</a> and review your
620- personal information, and confirm that it may be used and displayed
621- within the IETF datatracker.
609+ personal information, then scoll to the bottom and check the 'confirm'
610+ checkbox and submit the form, in order to to indicate that that the
611+ provided personal information may be used and displayed within the IETF
612+ datatracker.
622613
623614 """ % ', ' .join (require_consent )))
624615 return response
0 commit comments