Skip to content

Commit 109799b

Browse files
author
Peter Musgrave
committed
Ticket 552: Add IPR column to IESG Telechat Agenda
 - Legacy-Id: 2945
1 parent 6b997bc commit 109799b

4 files changed

Lines changed: 65 additions & 21 deletions

File tree

‎peter/ietf/iesg/views.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
from ietf.idrfc.utils import update_telechat
5050
from ietf.ietfauth.decorators import group_required
5151
from ietf.idtracker.templatetags.ietf_filters import in_group
52+
from ietf.ipr.models import IprRfc, IprDraft, IprDetail
5253
import datetime
5354
import tarfile
5455

@@ -287,11 +288,17 @@ def agenda_documents(request):
287288
section_key = "s" + get_doc_section(i)
288289
if section_key not in res:
289290
res[section_key] = []
291+
# PM - add code to fill in IPR details. (Would be better to use IdRfc_Wrapper - but this breaks other code
290292
if not i.rfc_flag:
291293
w = IdWrapper(draft=i)
294+
w.iprUrl = "/ipr/search?option=document_search&id_document_tag=" + str(w.id.tracker_id)
295+
iprs = IprDraft.objects.filter(document=w.id.tracker_id)
292296
else:
293297
ri = RfcIndex.objects.get(rfc_number=i.draft_id)
294298
w = RfcWrapper(ri)
299+
w.iprUrl = "/ipr/search?option=rfc_search&rfc_search=" + str(w.rfc.rfc_number)
300+
iprs = IprRfc.objects.filter(document=w.rfc.rfc_number)
301+
w.iprCount = len(iprs)
295302
w.reschedule_form = i.reschedule_form
296303
res[section_key].append(w)
297304
telechats.append({'date':date, 'docs':res})

‎peter/ietf/templates/idrfc/ipr_column_with_label.html‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{% comment %}
2+
Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
3+
All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions
7+
are met:
8+
9+
* Redistributions of source code must retain the above copyright
10+
notice, this list of conditions and the following disclaimer.
11+
12+
* Redistributions in binary form must reproduce the above
13+
copyright notice, this list of conditions and the following
14+
disclaimer in the documentation and/or other materials provided
15+
with the distribution.
16+
17+
* Neither the name of the Nokia Corporation and/or its
18+
subsidiary(-ies) nor the names of its contributors may be used
19+
to endorse or promote products derived from this software
20+
without specific prior written permission.
21+
22+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
23+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
24+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
25+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
26+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
27+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
28+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
30+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
32+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33+
{% endcomment %}
34+
{% load ietf_filters %}<td class="ipr">
35+
{% if doc.iprCount %}<a href="{{ doc.iprUrl }}" rel="nofollow"> IPR:{{ doc.iprCount }} </a>{% endif %}
36+
</td>

‎peter/ietf/templates/iesg/agenda_documents.html‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -73,59 +73,59 @@ <h1>Documents on Future IESG Telechat Agendas</h1>
7373
{% for t in telechats %}
7474

7575
{% if not forloop.first %}
76-
<tr class="header"><td colspan="5">&nbsp;</td></tr>
76+
<tr class="header"><td colspan="6">&nbsp;</td></tr>
7777
{% endif %}
7878

79-
<tr class="header telechat_date"><td colspan="5">IESG telechat {{t.date}}</td></tr>
79+
<tr class="header telechat_date"><td colspan="6">IESG telechat {{t.date}}</td></tr>
8080

8181
{% if forloop.first %}
82-
<tr class="header"><td colspan="5"><a href="/iesg/agenda/">Full IESG Agenda</a></td></tr>
82+
<tr class="header"><td colspan="6"><a href="/iesg/agenda/">Full IESG Agenda</a></td></tr>
8383
{% endif %}
8484

85-
<tr class="header"><td colspan="5"><a href="/iesg/agenda/telechat-{{t.date|date:"Y"}}-{{t.date|date:"m"}}-{{t.date|date:"d"}}-docs.tgz">Download Documents</a></td></tr>
85+
<tr class="header"><td colspan="6"><a href="/iesg/agenda/telechat-{{t.date|date:"Y"}}-{{t.date|date:"m"}}-{{t.date|date:"d"}}-docs.tgz">Download Documents</a></td></tr>
8686

87-
<tr class="header"><td colspan="5">2. Protocol Actions</td></tr>
87+
<tr class="header"><td colspan="6">2. Protocol Actions</td></tr>
8888

89-
<tr class="header"><td colspan="5">2.1 WG Submissions</td></tr>
89+
<tr class="header"><td colspan="6">2.1 WG Submissions</td></tr>
9090

9191
{% for doc in t.docs.s211 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
92-
{% if t.docs.s212 %}<tr class="header"><td colspan="5">2.1.2 Returning Item</td></tr>{% endif %}
92+
{% if t.docs.s212 %}<tr class="header"><td colspan="6">2.1.2 Returning Item</td></tr>{% endif %}
9393
{% for doc in t.docs.s212 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
94-
{% if t.docs.s213 %}<tr class="header"><td colspan="5">2.1.3 For Action</td></tr>{% endif %}
94+
{% if t.docs.s213 %}<tr class="header"><td colspan="6">2.1.3 For Action</td></tr>{% endif %}
9595
{% for doc in t.docs.s213 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
9696

97-
<tr class="header"><td colspan="5">2.2 Individual Submissions</td></tr>
97+
<tr class="header"><td colspan="6">2.2 Individual Submissions</td></tr>
9898

9999
{% for doc in t.docs.s221 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
100-
{% if t.docs.s222 %}<tr class="header"><td colspan="5">2.2.2 Returning Item</td></tr>{% endif %}
100+
{% if t.docs.s222 %}<tr class="header"><td colspan="6">2.2.2 Returning Item</td></tr>{% endif %}
101101
{% for doc in t.docs.s222 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
102-
{% if t.docs.s223 %}<tr class="header"><td colspan="5">2.2.3 For Action</td></tr>{% endif %}
102+
{% if t.docs.s223 %}<tr class="header"><td colspan="6">2.2.3 For Action</td></tr>{% endif %}
103103
{% for doc in t.docs.s223 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
104104

105-
<tr class="header"><td colspan="5">3. Document Actions</td></tr>
105+
<tr class="header"><td colspan="6">3. Document Actions</td></tr>
106106

107-
<tr class="header"><td colspan="5">3.1 WG Submissions</td></tr>
107+
<tr class="header"><td colspan="6">3.1 WG Submissions</td></tr>
108108

109109
{% for doc in t.docs.s311 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
110-
{% if t.docs.s312 %}<tr class="header"><td colspan="5">3.1.2 Returning Item</td></tr>{% endif %}
110+
{% if t.docs.s312 %}<tr class="header"><td colspan="6">3.1.2 Returning Item</td></tr>{% endif %}
111111
{% for doc in t.docs.s312 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
112-
{% if t.docs.s313 %}<tr class="header"><td colspan="5">3.1.3 For Action</td></tr>{% endif %}
112+
{% if t.docs.s313 %}<tr class="header"><td colspan="6">3.1.3 For Action</td></tr>{% endif %}
113113
{% for doc in t.docs.s313 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
114114

115-
<tr class="header"><td colspan="5">3.2 Individual Submissions Via AD</td></tr>
115+
<tr class="header"><td colspan="6">3.2 Individual Submissions Via AD</td></tr>
116116

117117
{% for doc in t.docs.s321 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
118-
{% if t.docs.s322 %}<tr class="header"><td colspan="5">3.2.2 Returning Item</td></tr>{% endif %}
118+
{% if t.docs.s322 %}<tr class="header"><td colspan="6">3.2.2 Returning Item</td></tr>{% endif %}
119119
{% for doc in t.docs.s322 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
120-
{% if t.docs.s323 %}<tr class="header"><td colspan="5">3.2.3 For Action</td></tr>{% endif %}
120+
{% if t.docs.s323 %}<tr class="header"><td colspan="6">3.2.3 For Action</td></tr>{% endif %}
121121
{% for doc in t.docs.s323 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
122122

123-
<tr class="header"><td colspan="5">3.3 IRTF and Independent Submission Stream Documents</td></tr>
123+
<tr class="header"><td colspan="6">3.3 IRTF and Independent Submission Stream Documents</td></tr>
124124

125125
{% for doc in t.docs.s331 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
126-
{% if t.docs.s332 %}<tr class="header"><td colspan="5">3.3.2 Returning Item</td></tr>{% endif %}
126+
{% if t.docs.s332 %}<tr class="header"><td colspan="6">3.3.2 Returning Item</td></tr>{% endif %}
127127
{% for doc in t.docs.s332 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
128-
{% if t.docs.s333 %}<tr class="header"><td colspan="5">3.3.3 For Action</td></tr>{% endif %}
128+
{% if t.docs.s333 %}<tr class="header"><td colspan="6">3.3.3 For Action</td></tr>{% endif %}
129129
{% for doc in t.docs.s333 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
130130

131131
{% endfor %}

‎peter/ietf/templates/iesg/agenda_documents_row.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,6 @@
5656
</td>
5757
<td class="title">{{ doc.title }}</td>
5858
{% include "iesg/agenda_documents_row_status.html" %}
59+
{% include "idrfc/ipr_column_with_label.html" %}
5960
<td class="ad">{{ doc.ad_name|default:"" }}</td>
6061
</tr>

0 commit comments

Comments
 (0)