altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged in [13503] from rjsparks@nostrum.com:

Browse source 
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
This commit is contained in:
Henrik Levkowetz 2017-06-04 21:49:43 +00:00
parent d041edf1b3
commit b3fe24d76b
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/count.c
View file

@ -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) {

9
ietf/templates/person/mail/possible_duplicates.txt
View file

@ -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 %}