Merged in [11085] from bartosz.balazinski@interdigital.com:

    Added validation for the dependency graph output type (one of 'dot', 'pdf', 'svg').  Added an area column to the directorate summary page.

    Commit fixes bug ietf-tools#1887, fixes bug ietf-tools#1940.
 - Legacy-Id: 11095
Note: SVN reference [11085] has been migrated to Git commit b46081f

Author: levkowetz

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()

ietf/templates/group/active_dirs.html

@@ -17,6 +17,7 @@ <h1>Active Directorates</h1>
       <tr>
         <th>Team</th>
         <th>Name</th>
+        <th>Area</th>
         <th>AD</th>
         <th>Secretaries</th>
         <th>Chairs</th>
@@ -27,6 +28,7 @@ <h1>Active Directorates</h1>
         <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 @@ <h1>Active Directorates</h1>
 
 {% block js %}
 <script src="{% static "jquery.tablesorter/js/jquery.tablesorter.combined.min.js" %}"></script>
-{% endblock %}
+{% endblock %}