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

Merged in [7879] and [7880] from olau@iola.dk to fix a couple of issues with the 5.5.0 release.

Browse source 
- Legacy-Id: 7885
Note: SVN reference [7879] has been migrated to Git commit 0078057173

Note: SVN reference [7880] has been migrated to Git commit 8d5006a890
This commit is contained in:
Henrik Levkowetz 2014-06-10 15:18:08 +00:00
parent fa55bd608c 8d5006a890
commit fdc93d40fe
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/group/mails.py
View file

@ -23,7 +23,7 @@ def email_secretariat(request, group, subject, text):
dict(text=text,
group=group,
group_url=settings.IDTRACKER_BASE_URL + urlreverse('group_charter', kwargs=dict(group_type=group.type_id, acronym=group.acronym)),
charter_url=settings.IDTRACKER_BASE_URL + urlreverse('doc_view', kwargs=dict(name=group.charter.name)),
charter_url=settings.IDTRACKER_BASE_URL + urlreverse('doc_view', kwargs=dict(name=group.charter.name)) if group.charter else "[no charter]",
)
)

2
ietf/templates/group/edit_milestones.html
View file

@ -43,7 +43,9 @@ tr.milestone.add { font-style: italic; }
<p>Links:
<a href="{% url "group_charter" group_type=group.type_id acronym=group.acronym %}">{{ group.acronym }} {{ group.type.name }}</a>
{% if group.charter %}
- <a href="{% url "doc_view" name=group.charter.canonical_name %}">{{ group.charter.canonical_name }}</a>
{% endif %}
</p>