fix several issues with IPR references in iesg templates. Commit ready for merge.

- Legacy-Id: 8849
This commit is contained in:
Ryan Cross 2015-01-08 01:35:39 +00:00
parent c957f3383b
commit e934aa8e73
6 changed files with 11 additions and 11 deletions

View file

@ -25,9 +25,9 @@
<h5>IPR:</h5>
<ul>
{% for ipr in conflictdoc.ipr %}
{% if ipr.ipr.status == 1 %}
<li><a href="/ipr/{{ ipr.ipr.ipr_id }}/">{{ ipr.ipr.title }}</a></li>
{% endif %}
{% if ipr.disclosure.state.slug == "posted" %}
<li><a href="/ipr/{{ ipr.disclosure.id }}/">{{ ipr.disclosure.title }}</a></li>
{% endif %}
{% endfor %}
</ul>

View file

@ -28,8 +28,8 @@
<h5>IPR:</h5>
<ul>
{% for ipr in doc.ipr %}
{% if ipr.ipr.status == 1 %}
<li><a href="/ipr/{{ ipr.ipr.ipr_id }}/">{{ ipr.ipr.title }}</a></li>
{% if ipr.disclosure.state.slug == "posted" %}
<li><a href="/ipr/{{ ipr.disclosure.id }}/">{{ ipr.disclosure.title }}</a></li>
{% endif %}
{% endfor %}
</ul>

View file

@ -12,8 +12,8 @@
<br>Note: {{ doc.conflictdoc.note|linebreaksbr }}
{% endif %}
{% for ipr in doc.conflictdoc.ipr %}
{% if ipr.ipr.status == 1 %}
<br>IPR: <a href="https://{{ domain }}/ipr/{{ ipr.ipr.ipr_id }}/">{{ ipr.ipr.title }}</a>
{% if ipr.disclosure.state.slug == "posted" %}
<br>IPR: <a href="https://{{ domain }}/ipr/{{ ipr.disclosure.id }}/">{{ ipr.disclosure.title }}</a>
{% endif %}
{% endfor %}
</div>

View file

@ -16,8 +16,8 @@
{% endif %}
{% for ipr in doc.ipr %}
{% if ipr.ipr.status == 1 %}
<br>IPR: <a href="https://datatracker.ietf.org/ipr/{{ ipr.ipr.ipr_id }}/">{{ ipr.ipr.title }}</a>
{% if ipr.disclosure.state.slug == "posted" %}
<br>IPR: <a href="https://datatracker.ietf.org/ipr/{{ ipr.disclosure.id }}/">{{ ipr.disclosure.title }}</a>
{% endif %}
{% endfor %}

View file

@ -5,7 +5,7 @@
{% block title %}IPR Details - {{ ipr.title }}{% endblock %}
{% block pagehead %}
<meta name="description" content="IPR disclosure #{{ipr.ipr_id}}: {{ ipr.title }} ({{ ipr.time|date:"Y" }})" />
<meta name="description" content="IPR disclosure #{{ipr.id}}: {{ ipr.title }} ({{ ipr.time|date:"Y" }})" />
<link rel="stylesheet" type="text/css" href="/css/jquery-ui-themes/jquery-ui-1.8.11.custom.css"></link>
<link rel="stylesheet" type="text/css" href="/css/ipr.css"></link>
{% endblock %}

View file

@ -31,7 +31,7 @@
<td>
{% for item in ipr.disclosure.updated_by.all %}
{% if item.source.state_id == "posted" %}
IPR disclosure ID# {{ item.ipr.ipr_id }} "<a href="{% url "ietf.ipr.views.show" item.source.id %}">{{ item.source.title }}</a>" Updates
IPR disclosure ID# {{ item.source.id }} "<a href="{% url "ietf.ipr.views.show" item.source.id %}">{{ item.source.title }}</a>" Updates
{% endif %}
{% endfor %}
<a href="{% url "ietf.ipr.views.show" ipr.id %}">"{{ ipr.disclosure.title }}"</a>