From b3fe24d76bb797ef8acddd9dc3843b5db96a2e82 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sun, 4 Jun 2017 21:49:43 +0000 Subject: [PATCH] Merged in [13503] from rjsparks@nostrum.com: Add usernames to the email sent to the secretariat when a possible duplicate person has been detected. Fixes #2307. - Legacy-Id: 13521 Note: SVN reference [13503] has been migrated to Git commit d330b8ded453b61eabc59589d44785d4fc09c767 --- bin/count.c | 2 +- ietf/templates/person/mail/possible_duplicates.txt | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/count.c b/bin/count.c index 52f531d66..869733df6 100644 --- a/bin/count.c +++ b/bin/count.c @@ -13,7 +13,7 @@ int main( void ) c = fgetc(stdin); while(c != EOF) { - if (c == '.') count++; + if (c=='.' || c=='E' || c=='F') count++; fputc(c, stdout); fflush(stdout); if ( count % 76 == 0) { diff --git a/ietf/templates/person/mail/possible_duplicates.txt b/ietf/templates/person/mail/possible_duplicates.txt index 1a1dab199..1c1772cf7 100644 --- a/ietf/templates/person/mail/possible_duplicates.txt +++ b/ietf/templates/person/mail/possible_duplicates.txt @@ -9,9 +9,10 @@ There are now {{persons|length}} Person objects sharing that name. Please check to see if they represent the same actual person, and if so, merge the objects as appropriate. {% for person in persons %}Person {{forloop.counter}} {{ person.name }} (pk={{person.pk}}) - time: {{person.time}} - ascii: {{person.ascii}} - email: {% for email in person.email_set.all %}{{ email.address }} {% endfor %} - aliases: {{ person.alias_set.all|join:", " }} + time: {{person.time}} + ascii: {{person.ascii}} + email: {% for email in person.email_set.all %}{{ email.address }} {% endfor %} + aliases: {{ person.alias_set.all|join:", " }} + username: {% if person.user %}{{person.user.username}}{% else %}None{% endif %} {% endfor %} {% endautoescape %}