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

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

Note: SVN reference [7880] has been migrated to Git commit 8d5006a

Author: levkowetz

ietf/group/mails.py

@@ -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]",
                    )
               )
 

ietf/templates/group/edit_milestones.html

@@ -43,7 +43,9 @@ <h1>{{ title }}</h1>
 
 <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>