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

Merged [5569] and [5572] from rjsparks@nostrum.com:

Browse source 
Small fixes in 4.43 and showing the shepherd (when there is one)
on search results, documents for this ad, and wg document lists.
Fixes bug #972.
 - Legacy-Id: 5651
Note: SVN reference [5572] has been migrated to Git commit 22b6085987
This commit is contained in:
Henrik Levkowetz 2013-04-15 22:21:37 +00:00
parent 90fe3989ee 22b6085987
commit d18dc43af7
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/idrfc/views_search.py
View file

@ -526,7 +526,7 @@ def search_results(request):
{'htitle': 'Date', 'htype':'date'},
{'htitle': 'Status', 'htype':'status', 'colspan':'2'},
{'htitle': 'IPR', 'htype':'ipr'},
{'htitle': 'Ad', 'htype':'ad'}]
{'htitle': 'Ad/Shepherd', 'htype':'ad'}]
# Make sure we know which one is selected (for visibility later)
if sort_by:

2
ietf/templates/idrfc/by_ad.html
View file

@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{% regroup docs by view_sort_group_byad as grouped_docs %}
<table class="ietf-table ietf-doctable">
<tr><th class="doc">Document</th><th class="title">Title</th><th class="date">Date</th><th class="status" colspan="2">Status</th><th class="ipr">ipr</th><th class="ad">Area Director</th></tr>
<tr><th class="doc">Document</th><th class="title">Title</th><th class="date">Date</th><th class="status" colspan="2">Status</th><th class="ipr">ipr</th><th class="ad">AD / Shepherd</th></tr>
{% for doc_group in grouped_docs %}
<tr class="header"><td colspan="7">{{doc_group.grouper}}s</td></tr>

4
ietf/templates/idrfc/search_result_row.html
View file

@ -55,5 +55,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{% include "idrfc/status_columns.html" %}
{% include "idrfc/ipr_column.html" %}
{# <td class="ad">{% if doc.ad_name %}{{ doc.ad_name }}{% else %}&nbsp;{% endif %}</td> #}
<td class="ad">{{ doc.ad_name|default:"" }}</td>
<td class="ad">{{ doc.ad_name|default:"" }}
{% if doc.id.underlying_document.shepherd %}<br/>{{ doc.id.underlying_document.shepherd.plain_name|default:""}}{% endif %}
</td>
</tr>

4
ietf/templates/wginfo/wg_documents.html
View file

@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<table class="ietf-table ietf-doctable" style="margin-top:16px;">
<tr>
{% if user.is_authenticated %}<th></th>{% endif %}
<th class="doc">Document</th><th class="title">Title</th><th class="date">Date</th><th class="status" colspan="2">Status</th><th class="ipr">ipr</th><th class="ad">Area Director</th>
<th class="doc">Document</th><th class="title">Title</th><th class="date">Date</th><th class="status" colspan="2">Status</th><th class="ipr">ipr</th><th class="ad">AD / Shepherd</th>
</tr>
{% for doc_group in grouped_docs %}
<tr class="header"><td colspan="7">{{doc_group.grouper}}s</td></tr>
@ -60,7 +60,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<table class="ietf-table ietf-doctable" style="margin-top:16px;">
<tr>
{% if user.is_authenticated %}<th></th>{% endif %}
<th class="doc">Related Documents</th><th class="title">Title</th><th class="date">Date</th><th class="status" colspan="2">Status</th><th class="ipr">ipr</th><th class="ad">Area Director</th>
<th class="doc">Related Documents</th><th class="title">Title</th><th class="date">Date</th><th class="status" colspan="2">Status</th><th class="ipr">ipr</th><th class="ad">AD / Shepherd</th>
</tr>
{% for doc_group in grouped_docs_related %}
<tr class="header"><td colspan="7">{{doc_group.grouper}}s</td></tr>