From b46081f51481947dc5a54dfc04ba1b11f30e6ae5 Mon Sep 17 00:00:00 2001
From: Bartosz Balazinski <bartosz.balazinski@interdigital.com>
Date: Sat, 2 Apr 2016 21:21:05 +0000
Subject: [PATCH] Commit fixes bug #1887, fixes bug #1940. Commit ready to
 merge  - Legacy-Id: 11085

---
 ietf/group/info.py                    | 2 +-
 ietf/templates/group/active_dirs.html | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ietf/group/info.py b/ietf/group/info.py
index c0a82a19d..099effe25 100644
--- a/ietf/group/info.py
+++ b/ietf/group/info.py
@@ -755,7 +755,7 @@ def make_dot(group):
 @cache_page(60 * 60)
 def dependencies(request, acronym, group_type=None, output_type="pdf"):
     group = get_group_or_404(acronym, group_type)
-    if not group.features.has_documents:
+    if not group.features.has_documents or output_type not in ["dot", "pdf", "svg"]:
         raise Http404
 
     dothandle, dotname = mkstemp()
diff --git a/ietf/templates/group/active_dirs.html b/ietf/templates/group/active_dirs.html
index c3a312189..3a06bdb97 100644
--- a/ietf/templates/group/active_dirs.html
+++ b/ietf/templates/group/active_dirs.html
@@ -17,6 +17,7 @@
       <tr>
         <th>Team</th>
         <th>Name</th>
+        <th>Area</th>
         <th>AD</th>
         <th>Secretaries</th>
         <th>Chairs</th>
@@ -27,6 +28,7 @@
         <tr>
           <td><a href="{% url "ietf.group.info.group_home" acronym=group.acronym %}">{{ group.acronym }}</a></td>
           <td>{{ group.name }}</td>
+          <td><a href="{% url "ietf.group.info.group_home" acronym=group.parent.acronym %}">{{ group.parent.acronym }}</a></td>
           <td>
             {% for ad in group.ads %}
               <a href="mailto:{{ ad.email.address }}">{{ ad.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}
@@ -50,4 +52,4 @@
 
 {% block js %}
 <script src="{% static "jquery.tablesorter/js/jquery.tablesorter.combined.min.js" %}"></script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}