Merged [2945] from peter.musgrave@magorcorp.com:
Ticket 552: Add IPR column to IESG Telechat Agenda - Legacy-Id: 2953 Note: SVN reference [2945] has been migrated to Git commit 109799b334a45053d62251bbb5107350fc5f4c57
This commit is contained in:
Henrik Levkowetz
parent
c3f3fdb79a
commit
f29a8fb2c6
ietf
iesg
templates
|
|
@ -49,6 +49,7 @@ from ietf.idrfc.models import RfcIndex
|
|||
from ietf.idrfc.utils import update_telechat
|
||||
from ietf.ietfauth.decorators import group_required
|
||||
from ietf.idtracker.templatetags.ietf_filters import in_group
|
||||
from ietf.ipr.models import IprRfc, IprDraft, IprDetail
|
||||
import datetime
|
||||
import tarfile
|
||||
|
||||
|
|
@ -287,11 +288,17 @@ def agenda_documents(request):
|
|||
section_key = "s" + get_doc_section(i)
|
||||
if section_key not in res:
|
||||
res[section_key] = []
|
||||
# PM - add code to fill in IPR details. (Would be better to use IdRfc_Wrapper - but this breaks other code
|
||||
if not i.rfc_flag:
|
||||
w = IdWrapper(draft=i)
|
||||
w.iprUrl = "/ipr/search?option=document_search&id_document_tag=" + str(w.id.tracker_id)
|
||||
iprs = IprDraft.objects.filter(document=w.id.tracker_id)
|
||||
else:
|
||||
ri = RfcIndex.objects.get(rfc_number=i.draft_id)
|
||||
w = RfcWrapper(ri)
|
||||
w.iprUrl = "/ipr/search?option=rfc_search&rfc_search=" + str(w.rfc.rfc_number)
|
||||
iprs = IprRfc.objects.filter(document=w.rfc.rfc_number)
|
||||
w.iprCount = len(iprs)
|
||||
w.reschedule_form = i.reschedule_form
|
||||
res[section_key].append(w)
|
||||
telechats.append({'date':date, 'docs':res})
|
||||
|
|
|
|||
36
ietf/templates/idrfc/ipr_column_with_label.html
Normal file
36
ietf/templates/idrfc/ipr_column_with_label.html
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{% comment %}
|
||||
Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
|
||||
All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions
|
||||
are met:
|
||||
|
||||
* Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
|
||||
* Redistributions in binary form must reproduce the above
|
||||
copyright notice, this list of conditions and the following
|
||||
disclaimer in the documentation and/or other materials provided
|
||||
with the distribution.
|
||||
|
||||
* Neither the name of the Nokia Corporation and/or its
|
||||
subsidiary(-ies) nor the names of its contributors may be used
|
||||
to endorse or promote products derived from this software
|
||||
without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
{% endcomment %}
|
||||
{% load ietf_filters %}<td class="ipr">
|
||||
{% if doc.iprCount %}<a href="{{ doc.iprUrl }}" rel="nofollow"> IPR:{{ doc.iprCount }} </a>{% endif %}
|
||||
</td>
|
||||
|
|
@ -73,59 +73,59 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
{% for t in telechats %}
|
||||
|
||||
{% if not forloop.first %}
|
||||
<tr class="header"><td colspan="5"> </td></tr>
|
||||
<tr class="header"><td colspan="6"> </td></tr>
|
||||
{% endif %}
|
||||
|
||||
<tr class="header telechat_date"><td colspan="5">IESG telechat {{t.date}}</td></tr>
|
||||
<tr class="header telechat_date"><td colspan="6">IESG telechat {{t.date}}</td></tr>
|
||||
|
||||
{% if forloop.first %}
|
||||
<tr class="header"><td colspan="5"><a href="/iesg/agenda/">Full IESG Agenda</a></td></tr>
|
||||
<tr class="header"><td colspan="6"><a href="/iesg/agenda/">Full IESG Agenda</a></td></tr>
|
||||
{% endif %}
|
||||
|
||||
<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>
|
||||
<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>
|
||||
|
||||
<tr class="header"><td colspan="5">2. Protocol Actions</td></tr>
|
||||
<tr class="header"><td colspan="6">2. Protocol Actions</td></tr>
|
||||
|
||||
<tr class="header"><td colspan="5">2.1 WG Submissions</td></tr>
|
||||
<tr class="header"><td colspan="6">2.1 WG Submissions</td></tr>
|
||||
|
||||
{% for doc in t.docs.s211 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
|
||||
{% if t.docs.s212 %}<tr class="header"><td colspan="5">2.1.2 Returning Item</td></tr>{% endif %}
|
||||
{% if t.docs.s212 %}<tr class="header"><td colspan="6">2.1.2 Returning Item</td></tr>{% endif %}
|
||||
{% for doc in t.docs.s212 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
|
||||
{% if t.docs.s213 %}<tr class="header"><td colspan="5">2.1.3 For Action</td></tr>{% endif %}
|
||||
{% if t.docs.s213 %}<tr class="header"><td colspan="6">2.1.3 For Action</td></tr>{% endif %}
|
||||
{% for doc in t.docs.s213 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
|
||||
|
||||
<tr class="header"><td colspan="5">2.2 Individual Submissions</td></tr>
|
||||
<tr class="header"><td colspan="6">2.2 Individual Submissions</td></tr>
|
||||
|
||||
{% for doc in t.docs.s221 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
|
||||
{% if t.docs.s222 %}<tr class="header"><td colspan="5">2.2.2 Returning Item</td></tr>{% endif %}
|
||||
{% if t.docs.s222 %}<tr class="header"><td colspan="6">2.2.2 Returning Item</td></tr>{% endif %}
|
||||
{% for doc in t.docs.s222 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
|
||||
{% if t.docs.s223 %}<tr class="header"><td colspan="5">2.2.3 For Action</td></tr>{% endif %}
|
||||
{% if t.docs.s223 %}<tr class="header"><td colspan="6">2.2.3 For Action</td></tr>{% endif %}
|
||||
{% for doc in t.docs.s223 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
|
||||
|
||||
<tr class="header"><td colspan="5">3. Document Actions</td></tr>
|
||||
<tr class="header"><td colspan="6">3. Document Actions</td></tr>
|
||||
|
||||
<tr class="header"><td colspan="5">3.1 WG Submissions</td></tr>
|
||||
<tr class="header"><td colspan="6">3.1 WG Submissions</td></tr>
|
||||
|
||||
{% for doc in t.docs.s311 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
|
||||
{% if t.docs.s312 %}<tr class="header"><td colspan="5">3.1.2 Returning Item</td></tr>{% endif %}
|
||||
{% if t.docs.s312 %}<tr class="header"><td colspan="6">3.1.2 Returning Item</td></tr>{% endif %}
|
||||
{% for doc in t.docs.s312 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
|
||||
{% if t.docs.s313 %}<tr class="header"><td colspan="5">3.1.3 For Action</td></tr>{% endif %}
|
||||
{% if t.docs.s313 %}<tr class="header"><td colspan="6">3.1.3 For Action</td></tr>{% endif %}
|
||||
{% for doc in t.docs.s313 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
|
||||
|
||||
<tr class="header"><td colspan="5">3.2 Individual Submissions Via AD</td></tr>
|
||||
<tr class="header"><td colspan="6">3.2 Individual Submissions Via AD</td></tr>
|
||||
|
||||
{% for doc in t.docs.s321 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
|
||||
{% if t.docs.s322 %}<tr class="header"><td colspan="5">3.2.2 Returning Item</td></tr>{% endif %}
|
||||
{% if t.docs.s322 %}<tr class="header"><td colspan="6">3.2.2 Returning Item</td></tr>{% endif %}
|
||||
{% for doc in t.docs.s322 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
|
||||
{% if t.docs.s323 %}<tr class="header"><td colspan="5">3.2.3 For Action</td></tr>{% endif %}
|
||||
{% if t.docs.s323 %}<tr class="header"><td colspan="6">3.2.3 For Action</td></tr>{% endif %}
|
||||
{% for doc in t.docs.s323 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
|
||||
|
||||
<tr class="header"><td colspan="5">3.3 IRTF and Independent Submission Stream Documents</td></tr>
|
||||
<tr class="header"><td colspan="6">3.3 IRTF and Independent Submission Stream Documents</td></tr>
|
||||
|
||||
{% for doc in t.docs.s331 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
|
||||
{% if t.docs.s332 %}<tr class="header"><td colspan="5">3.3.2 Returning Item</td></tr>{% endif %}
|
||||
{% if t.docs.s332 %}<tr class="header"><td colspan="6">3.3.2 Returning Item</td></tr>{% endif %}
|
||||
{% for doc in t.docs.s332 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
|
||||
{% if t.docs.s333 %}<tr class="header"><td colspan="5">3.3.3 For Action</td></tr>{% endif %}
|
||||
{% if t.docs.s333 %}<tr class="header"><td colspan="6">3.3.3 For Action</td></tr>{% endif %}
|
||||
{% for doc in t.docs.s333 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%}
|
||||
|
||||
{% endfor %}
|
||||
|
|
|
|||
|
|
@ -56,5 +56,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
</td>
|
||||
<td class="title">{{ doc.title }}</td>
|
||||
{% include "iesg/agenda_documents_row_status.html" %}
|
||||
{% include "idrfc/ipr_column_with_label.html" %}
|
||||
<td class="ad">{{ doc.ad_name|default:"" }}</td>
|
||||
</tr>
|
||||
|
|
|
|||
Loading…
Reference in a new issue