Merged in [9852] from lars@netapp.com:

Fix display of AD and shepherd names, and also fix the respective mailto: links.
 - Legacy-Id: 9865
Note: SVN reference [9852] has been migrated to Git commit 573496df73
This commit is contained in:
Henrik Levkowetz 2015-07-23 08:25:02 +00:00
parent 3540c1bedc
commit 615a12485c

View file

@ -87,9 +87,9 @@
{% if ad_name == None or ad_name != doc.ad.plain_name %}
<td class="ad">
{% if doc.ad %}
<div><a title="AD" href="mailto:doc.ad.email.address">{{ doc.ad }}</a></div>
<a title="AD" href="mailto:{{ doc.ad.email_address|urlencode }}">{{ doc.ad }}</a><br>
{% endif %}
{% if doc.shepherd %}<a title="Shepherd" href="{{doc.shepherd}}"><small class="text-muted">{{doc.shepherd|emailwrap|default:""}}</small></a>{% endif %}
{% if doc.shepherd %}<a title="Shepherd" href="mailto:{{doc.shepherd}}"><small class="text-muted">{{doc.shepherd.person.name}}</small></a>{% endif %}
</td>
{% else %}
<td></td>