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

Added some test cases for wginfo/; added missing safe/escape tags found by Django 1.1 testing

Browse source 
- Legacy-Id: 1704
This commit is contained in:
Pasi Eronen 2009-09-25 17:32:07 +00:00
parent 79a2215ee8
commit 281e7746f6
5 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ietf/templates/wginfo/summary-by-acronym.txt
View file

@ -1,3 +1,4 @@
{% load ietf_filters %}
IETF Working Group Summary (By Acronym)
@ -5,10 +6,10 @@ The following Area Abreviations are used in this document
{% for area in area_list %}
{{ area }} - {{ area.area_acronym.name }}{% endfor %}
{% for wg in wg_list|dictsort:"group_acronym.acronym" %}{% if wg.start_date %}
{{ wg.group_acronym.name }} ({{ wg }}) -- {{ wg.area.area|upper }}
{% for chair in wg.wgchair_set.all %}{% if forloop.first %} Chair{{ forloop.revcounter|pluralize:": ,s:" }} {% else %} {% endif %}{{ chair.person }} <{{ chair.person.email.1 }}>
{{ wg.group_acronym.name|safe }} ({{ wg }}) -- {{ wg.area.area|upper }}
{% for chair in wg.wgchair_set.all %}{% if forloop.first %} Chair{{ forloop.revcounter|pluralize:": ,s:" }} {% else %} {% endif %}{{ chair.person|safe }} <{{ chair.person.email.1 }}>
{% endfor %} WG Mail: {{ wg.email_address }}
To Join: {{ wg.email_subscribe }}{%if wg.email_keyword %}
In Body: {{ wg.email_keyword }}{% endif %}
In Body: {{ wg.email_keyword|safe }}{% endif %}
Archive: {{ wg.email_archive }}
{% endif %}{% endfor %}

6
ietf/templates/wginfo/summary-by-area.txt
View file

@ -4,10 +4,10 @@
{{ wg.area_acronym.name|dashify }}------{% for ad in wg.area_directors %}
{{ ad.person }} <{{ ad.person.email.1 }}>{% endfor %}
{% endif %}{% if wg.start_date %}
{{ wg.group_acronym.name }} ({{ wg }})
{% for chair in wg.wgchair_set.all %}{% if forloop.first %} Chair{{ forloop.revcounter|pluralize:": ,s:" }} {% else %} {% endif %}{{ chair.person }} <{{ chair.person.email.1 }}>
{{ wg.group_acronym.name|safe }} ({{ wg }})
{% for chair in wg.wgchair_set.all %}{% if forloop.first %} Chair{{ forloop.revcounter|pluralize:": ,s:" }} {% else %} {% endif %}{{ chair.person|safe }} <{{ chair.person.email.1 }}>
{% endfor %} WG Mail: {{ wg.email_address }}
To Join: {{ wg.email_subscribe }}{%if wg.email_keyword %}
In Body: {{ wg.email_keyword }}{% endif %}
In Body: {{ wg.email_keyword|safe }}{% endif %}
Archive: {{ wg.email_archive }}
{% endif %}{% endifequal %}{% endfor %}{% endfor %}

12
ietf/templates/wginfo/wg-charter.html
View file

@ -2,12 +2,12 @@
{% load ietf_filters %}
{# Copyright The IETF Trust 2009, All Rights Reserved #}
{% block title %} {{ wg.group_acronym.name }} ({{wg}}) Charter {% endblock %}
{% block title %} {{ wg.group_acronym.name|escape }} ({{wg}}) Charter {% endblock %}
{% block content %}
{% ifequal wg.status.status 'Concluded' %}<div class="wgdone"> {%endifequal%}
{% ifequal wg.status.status 'Dormant' %}<div class="wgdormant"> {%endifequal%}
<h1>{{wg.group_acronym.name}} ({{wg}}) {{wg.group_type}}</h1>
<h1>{{wg.group_acronym.name|escape}} ({{wg}}) {{wg.group_type}}</h1>
<p>Last Modified: {{ wg.last_modified_date }}</p>
<p>Status: {% ifequal wg.status.status 'Active' %}Active{%else%}
@ -20,7 +20,7 @@
<h2>Chair{{ wg.chairs.count|pluralize:",s" }}:</h2>
<ul>
{% for chair in wg.chairs %}
<li><a href="mailto:{{ chair.person.email.1 }}">{{ chair.person }} &lt;{{ chair.person.email.1 }}&gt;</a></li>
<li><a href="mailto:{{ chair.person.email.1 }}">{{ chair.person|escape }} &lt;{{ chair.person.email.1 }}&gt;</a></li>
{% endfor %}
</ul>
@ -97,7 +97,7 @@
{{ milestone.expected_due_date.year }}
{% endif %}
</td>
<td>{{ milestone.description }}
<td>{{ milestone.description|escape }}
</td></tr>
{% endfor %}
<table>
@ -105,7 +105,7 @@
<h2>Internet-Drafts:</h2>
<ul>
{% for draft in wg.drafts %}
<li><a href="{{draft.doclink}}">{{draft.title}}</a> ({{ draft.txt_page_count }} pages)</li>
<li><a href="{{draft.doclink}}">{{draft.title|escape}}</a> ({{ draft.txt_page_count }} pages)</li>
{% endfor %}
</ul>
@ -114,7 +114,7 @@
<table>
{% for rfc in wg.rfcs %}
<tr><td>{{rfc}}{% if rfc.fyi_number %}<br> / FYI{{rfc.fyi_number}}{%endif%}{% if rfc.std_number %}<br> / STD{{rfc.std_number}}{%endif%}:
</td><td><a href="{{rfc.doclink}}">{{rfc.title}}</a> ({{rfc.txt_page_count}} pages)
</td><td><a href="{{rfc.doclink}}">{{rfc.title|escape}}</a> ({{rfc.txt_page_count}} pages)
{% for obs in rfc.obsoletes%}
- <font color="orange">{{obs.action}} RFC{{obs.rfc_acted_on_id}}</font>
{% endfor %}

20
ietf/templates/wginfo/wg-charter.txt
View file

@ -1,4 +1,4 @@
{% load ietf_filters %}{{wg.group_acronym.name}} ({{wg}})
{% load ietf_filters %}{{wg.group_acronym.name|safe}} ({{wg}})
{{ wg.group_acronym.name|dashify }}{{ wg.group_acronym.acronym|dashify }}---
Charter
@ -7,22 +7,22 @@
Current Status: {{ wg.status }}
Chair{{ wg.chairs.count|pluralize:",s" }}:
{% for chair in wg.chairs %} {{ chair.person }} <{{chair.person.email.1}}>
{% for chair in wg.chairs %} {{ chair.person|safe }} <{{chair.person.email.1}}>
{% endfor %}
{{wg.area.area.area_acronym.name}} Directors:
{% for ad in wg.area_directors %} {{ ad.person }} <{{ad.person.email.1}}>
{% for ad in wg.area_directors %} {{ ad.person|safe }} <{{ad.person.email.1}}>
{% endfor %}
{{wg.area.area.area_acronym.name}} Advisor:
{{ wg.area_director.person }} <{{wg.area_director.person.email.1}}>
{{ wg.area_director.person|safe }} <{{wg.area_director.person.email.1}}>
{% if wg.wgtechadvisor_set.count %}
Tech Advisor{{ wg.wgtechadvisor_set.count|pluralize:",s" }}:
{% for techadvisor in wg.wgtechadvisor_set.all %} {{ techadvisor.person }} <{{techadvisor.person.email.1}}>
{% for techadvisor in wg.wgtechadvisor_set.all %} {{ techadvisor.person|safe }} <{{techadvisor.person.email.1}}>
{% endfor %}{% endif %}{% if wg.wgeditor_set.count %}
Editor{{ wg.wgeditor_set.count|pluralize:",s" }}:
{% for editor in wg.wgeditor_set.all %} {{ editor.person }} <{{editor.person.email.1}}>
{% for editor in wg.wgeditor_set.all %} {{ editor.person|safe }} <{{editor.person.email.1}}>
{% endfor %}{% endif %}{% if wg.secretaries %}
Secretar{{ wg.secretaries.count|pluralize:"y,ies" }}:
{% for secretary in wg.secretaries %} {{ secretary.person }} <{{secretary.person.email.1}}>
{% for secretary in wg.secretaries %} {{ secretary.person|safe }} <{{secretary.person.email.1}}>
{% endfor %}{% endif %}
Mailing Lists:
General Discussion: {{ wg.email_address }}
@ -34,13 +34,13 @@ Description of Working Group:
{{ wg.charter_text|indent }}
Goals and Milestones:
{% for milestone in wg.milestones %} {% if milestone.done %}Done {% else %}{%ifequal milestone.expected_due_date.month 1 %}Jan{% endifequal %}{%ifequal milestone.expected_due_date.month 2 %}Feb{% endifequal %}{%ifequal milestone.expected_due_date.month 3 %}Mar{% endifequal %}{%ifequal milestone.expected_due_date.month 4 %}Apr{% endifequal %}{%ifequal milestone.expected_due_date.month 5 %}May{% endifequal %}{%ifequal milestone.expected_due_date.month 6 %}Jun{% endifequal %}{%ifequal milestone.expected_due_date.month 7 %}Jul{% endifequal %}{%ifequal milestone.expected_due_date.month 8 %}Aug{% endifequal %}{%ifequal milestone.expected_due_date.month 9 %}Sep{% endifequal %}{%ifequal milestone.expected_due_date.month 10 %}Oct{% endifequal %}{%ifequal milestone.expected_due_date.month 11 %}Nov{% endifequal %}{%ifequal milestone.expected_due_date.month 12 %}Dec{% endifequal %} {{ milestone.expected_due_date.year }}{% endif %} - {{ milestone.description }}
{% for milestone in wg.milestones %} {% if milestone.done %}Done {% else %}{%ifequal milestone.expected_due_date.month 1 %}Jan{% endifequal %}{%ifequal milestone.expected_due_date.month 2 %}Feb{% endifequal %}{%ifequal milestone.expected_due_date.month 3 %}Mar{% endifequal %}{%ifequal milestone.expected_due_date.month 4 %}Apr{% endifequal %}{%ifequal milestone.expected_due_date.month 5 %}May{% endifequal %}{%ifequal milestone.expected_due_date.month 6 %}Jun{% endifequal %}{%ifequal milestone.expected_due_date.month 7 %}Jul{% endifequal %}{%ifequal milestone.expected_due_date.month 8 %}Aug{% endifequal %}{%ifequal milestone.expected_due_date.month 9 %}Sep{% endifequal %}{%ifequal milestone.expected_due_date.month 10 %}Oct{% endifequal %}{%ifequal milestone.expected_due_date.month 11 %}Nov{% endifequal %}{%ifequal milestone.expected_due_date.month 12 %}Dec{% endifequal %} {{ milestone.expected_due_date.year }}{% endif %} - {{ milestone.description|safe }}
{% endfor %}
Internet-Drafts:
{% for draft in wg.drafts %} - {{draft.title}} [{{draft.filename}}-{{draft.revision}}] ({{ draft.txt_page_count }} pages)
{% for draft in wg.drafts %} - {{draft.title|safe}} [{{draft.filename}}-{{draft.revision}}] ({{ draft.txt_page_count }} pages)
{% endfor %}
{% if wg.rfcs %}Requests for Comments:
{% for rfc in wg.rfcs %} {{rfc}}: {{rfc.title}} ({{ rfc.txt_page_count }} pages){% for obs in rfc.obsoletes%}
{% for rfc in wg.rfcs %} {{rfc}}: {{rfc.title|safe}} ({{ rfc.txt_page_count }} pages){% for obs in rfc.obsoletes%}
* {{obs.action}} RFC{{obs.rfc_acted_on_id}}{% endfor %}{% for obs in rfc.obsoleted_by%}
* {%ifequal obs.action 'Obsoletes'%}OBSOLETED BY{%else%}Updated by{%endifequal%} RFC{{obs.rfc_id}}{% endfor %}
{%endfor%}

4
ietf/wginfo/testurl.list
View file

@ -5,6 +5,10 @@
200 /wg/summary-by-acronym.txt
200 /wg/pkix-charter.html
200 /wg/pkix-charter.txt
200 /wg/csi-charter.html
200 /wg/csi-charter.txt
200 /wg/v6ops-charter.html
200 /wg/v6ops-charter.txt
404 /wg/nosuchgroup-charter.html
404 /wg/nosuchgroup-charter.txt
200 /wg/1wg-charters.txt