Skip to content

Commit e934aa8

Browse files
committed
fix several issues with IPR references in iesg templates. Commit ready for merge.
- Legacy-Id: 8849
1 parent c957f33 commit e934aa8

6 files changed

Lines changed: 11 additions & 11 deletions

File tree

ietf/templates/iesg/agenda_conflict_doc.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
<h5>IPR:</h5>
2626
<ul>
2727
{% for ipr in conflictdoc.ipr %}
28-
{% if ipr.ipr.status == 1 %}
29-
<li><a href="/ipr/{{ ipr.ipr.ipr_id }}/">{{ ipr.ipr.title }}</a></li>
30-
{% endif %}
28+
{% if ipr.disclosure.state.slug == "posted" %}
29+
<li><a href="/ipr/{{ ipr.disclosure.id }}/">{{ ipr.disclosure.title }}</a></li>
30+
{% endif %}
3131
{% endfor %}
3232
</ul>
3333

ietf/templates/iesg/agenda_doc.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
<h5>IPR:</h5>
2929
<ul>
3030
{% for ipr in doc.ipr %}
31-
{% if ipr.ipr.status == 1 %}
32-
<li><a href="/ipr/{{ ipr.ipr.ipr_id }}/">{{ ipr.ipr.title }}</a></li>
31+
{% if ipr.disclosure.state.slug == "posted" %}
32+
<li><a href="/ipr/{{ ipr.disclosure.id }}/">{{ ipr.disclosure.title }}</a></li>
3333
{% endif %}
3434
{% endfor %}
3535
</ul>

ietf/templates/iesg/scribe_conflict_doc.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<br>Note: {{ doc.conflictdoc.note|linebreaksbr }}
1313
{% endif %}
1414
{% for ipr in doc.conflictdoc.ipr %}
15-
{% if ipr.ipr.status == 1 %}
16-
<br>IPR: <a href="https://{{ domain }}/ipr/{{ ipr.ipr.ipr_id }}/">{{ ipr.ipr.title }}</a>
15+
{% if ipr.disclosure.state.slug == "posted" %}
16+
<br>IPR: <a href="https://{{ domain }}/ipr/{{ ipr.disclosure.id }}/">{{ ipr.disclosure.title }}</a>
1717
{% endif %}
1818
{% endfor %}
1919
</div>

ietf/templates/iesg/scribe_doc.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
{% endif %}
1717

1818
{% for ipr in doc.ipr %}
19-
{% if ipr.ipr.status == 1 %}
20-
<br>IPR: <a href="https://datatracker.ietf.org/ipr/{{ ipr.ipr.ipr_id }}/">{{ ipr.ipr.title }}</a>
19+
{% if ipr.disclosure.state.slug == "posted" %}
20+
<br>IPR: <a href="https://datatracker.ietf.org/ipr/{{ ipr.disclosure.id }}/">{{ ipr.disclosure.title }}</a>
2121
{% endif %}
2222
{% endfor %}
2323

ietf/templates/ipr/details_base.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{% block title %}IPR Details - {{ ipr.title }}{% endblock %}
66

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

ietf/templates/ipr/search_doctitle_result.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<td>
3232
{% for item in ipr.disclosure.updated_by.all %}
3333
{% if item.source.state_id == "posted" %}
34-
IPR disclosure ID# {{ item.ipr.ipr_id }} "<a href="{% url "ietf.ipr.views.show" item.source.id %}">{{ item.source.title }}</a>" Updates
34+
IPR disclosure ID# {{ item.source.id }} "<a href="{% url "ietf.ipr.views.show" item.source.id %}">{{ item.source.title }}</a>" Updates
3535
{% endif %}
3636
{% endfor %}
3737
<a href="{% url "ietf.ipr.views.show" ipr.id %}">"{{ ipr.disclosure.title }}"</a>

0 commit comments

Comments
 (0)