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

Merged in [10109] from rjsparks@nostrum.com:

Browse source 
Make it clearer in search results when one IPR disclosure updates another. Fixes #1798.
 - Legacy-Id: 10117
Note: SVN reference [10109] has been migrated to Git commit a6b8707030f0e6411b1acc3b38a0fd426c5223a1
This commit is contained in:
Henrik Levkowetz 2015-10-01 20:26:23 +00:00
parent f3936db48f
commit 9688749404
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
hold-for-merge
View file

@ -1,5 +1,8 @@
# -*- conf-mode -*-
branch/iola/docalias-primary-key-r10101 @ 10111
branch/amsl/liaisons/6.4.1 @ 10098
personal/lars/6.2.1.dev0@9970 # Requires the timeline work
personal/lars/6.0.5.dev0@9734 # Obsoleted - don't use 'bleach'
personal/lars/6.0.5.dev0@9732 # Already fixed in a different merge

8
ietf/templates/ipr/search_doc_result.html
View file

@ -24,7 +24,9 @@
<tr>
<td class="text-nowrap">{{ ipr.time|date:"Y-m-d" }}</td>
<td>{{ ipr.id }}</td>
<td><a href="{% url "ietf.ipr.views.show" id=ipr.id %}">{{ ipr.title }}</a></td>
<td><a href="{% url "ietf.ipr.views.show" id=ipr.id %}">{{ ipr.title }}</a>
{% if ipr.updates %} <br/>(Updates ID#: {% for upd in ipr.updates %}{{upd.target_id}}{% if not forloop.last %}, {% endif %}{% endfor %}){% endif %}
</td>
</tr>
{% endfor %}
</tbody>
@ -57,7 +59,9 @@
<tr>
<td class="text-nowrap">{{ ipr.disclosure.time|date:"Y-m-d" }}</td>
<td>{{ ipr.disclosure.id }}</td>
<td><a href="{% url "ietf.ipr.views.show" id=ipr.disclosure.id %}">{{ ipr.disclosure.title }}</a></td>
<td><a href="{% url "ietf.ipr.views.show" id=ipr.disclosure.id %}">{{ ipr.disclosure.title }}</a>
{% if ipr.disclosure.updates %} <br/>(Updates ID#: {% for upd in ipr.disclosure.updates %}{{upd.target_id}}{% if not forloop.last %}, {% endif %}{% endfor %}){% endif %}
</td>
</tr>
{% endif %}
{% endfor %}

4
ready-for-merge
View file

@ -7,8 +7,8 @@
# --- Add entries at the top ---
branch/iola/docalias-primary-key-r10101 @ 10111
branch/amsl/liaisons/6.4.1 @ 10098
#branch/iola/docalias-primary-key-r10101 @ 10111
#branch/amsl/liaisons/6.4.1 @ 10098
branch/iola/meeting-history-r9663 @ 9669
branch/iola/milestone-editing-bugfix-r9994 @ 9996
#personal/rjs/v6.0.2.dev0@9540:9542

2
requirements.txt
View file

@ -1,7 +1,7 @@
# -*- conf-mode -*-
setuptools>=1.2 # Require this first, to prevent later errors
#
coverage>=3.7.1
coverage>=3.7.1,<4.0
#cssselect>=0.6.1 # for PyQuery
decorator>=3.4.0
defusedxml>=0.4.1 # for TastyPie when ussing xml; not a declared dependency