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

Make IESG discusses use doc/search/status_columns.html with a quick hack to break dependency on ietfworkflows, remove now unused idrfc/status_columns.html, remove unused iesg/agenda_documents_row_status.html

Browse source 
- Legacy-Id: 6220
This commit is contained in:
Ole Laursen 2013-09-20 15:55:28 +00:00
parent 2e29298d0c
commit b4988b2b45
4 changed files with 5 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ietf/iesg/views.py
View file

@ -620,6 +620,10 @@ def discusses(request):
doc = IdWrapper(draft=d)
if doc.in_ietf_process() and doc.ietf_process.has_active_iesg_ballot():
# quick hack - to be removed when the proxy code is removed
doc.underlying = doc.underlying_document()
doc.underlying.milestones = d.groupmilestone_set.filter(state="active").order_by("time").select_related("group")
res.append(doc)
return direct_to_template(request, 'iesg/discusses.html', {'docs':res})

51
ietf/templates/idrfc/status_columns.html
View file

@ -1,51 +0,0 @@
{% 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 ietf_streams %}{% load ballot_icon %}
<td class="status">
{{ doc.friendly_state|safe }} {% if not doc.rfc %}{{ doc.id|state_age_colored|safe }}{% endif %}
{% if not hide_telechat_date %}{% if doc.telechat_date %}<br/>IESG Telechat: {{ doc.telechat_date }}{% endif %}{% endif %}
{% block extra_status %}{% endblock %}
{% if doc.rfc %}
{% if doc.rfc.obsoleted_by %}<br />Obsoleted by {{ doc.rfc.obsoleted_by|urlize_ietf_docs }}{%endif %}
{% if doc.rfc.updated_by %}<br />Updated by {{ doc.rfc.updated_by|urlize_ietf_docs }}{%endif %}
{% if doc.rfc.has_errata %}<br /><a href="http://www.rfc-editor.org/errata_search.php?rfc={{doc.rfc.rfc_number}}" rel="nofollow">Errata</a>{% endif %}
{% else %}{# not rfc #}
{% if doc.id.rfc_editor_state %}<br />RFC Editor State: <a href="http://www.rfc-editor.org/queue2.html#{{doc.id.draft_name}}">{{ doc.id.rfc_editor_state|escape }}</a>{% endif %}
{% stream_state doc %}
{% endif %}
</td>
<td class="ballot">
{% if doc.rfc and doc.rfc.in_ietf_process and doc.rfc.ietf_process.has_active_iesg_ballot %}{% ballot_icon doc.rfc %}{% else %}{% if doc.id %}{% ballot_icon doc.id %}{%endif%}{%endif%}
</td>

4
ietf/templates/iesg/agenda_documents_row_status.html
View file

@ -1,4 +0,0 @@
{% extends "idrfc/status_columns.html" %}
{% block extra_status %}
<br/>Intended status: {{doc.ietf_process.intended_maturity_level}}
{% endblock %}

2
ietf/templates/iesg/discusses.html
View file

@ -58,7 +58,7 @@ Show: <input type="radio" name="discuss_show" checked="checked" value="all" id="
{% for doc in docs %}
<tr class="discuss_row {% cycle oddrow,evenrow %} {% if user|in_group:"Area_Director" %}{% if doc|my_position:user|equal:"Discuss" %}discuss_byme{% else %}discuss_notbyme{% endif %} {% ifequal user.get_profile.person|lower doc.ad_name|lower %}discuss_forme{%else%}discuss_notforme{%endifequal%}{% endif %}">
<td class="doc">{{ doc.displayname_with_link|safe }}</td>
{% include "idrfc/status_columns.html" %}
{% with doc.underlying as doc %}{% include "doc/search/status_columns.html" %}{% endwith %}
<td class="ad">{{ doc.ad_name|default:"" }}</td>
<td>
{% for po in doc.ietf_process.iesg_ballot.get_discuss|dictsort:"is_old_ad" %}