diff --git a/ietf/templates/iesg/agenda_conflict_doc.html b/ietf/templates/iesg/agenda_conflict_doc.html index a2c5a8243..dacaade30 100644 --- a/ietf/templates/iesg/agenda_conflict_doc.html +++ b/ietf/templates/iesg/agenda_conflict_doc.html @@ -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> diff --git a/ietf/templates/iesg/agenda_doc.html b/ietf/templates/iesg/agenda_doc.html index fbb01e603..2b6eadfd8 100644 --- a/ietf/templates/iesg/agenda_doc.html +++ b/ietf/templates/iesg/agenda_doc.html @@ -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> diff --git a/ietf/templates/iesg/scribe_conflict_doc.html b/ietf/templates/iesg/scribe_conflict_doc.html index e4be92830..cec159538 100644 --- a/ietf/templates/iesg/scribe_conflict_doc.html +++ b/ietf/templates/iesg/scribe_conflict_doc.html @@ -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> diff --git a/ietf/templates/iesg/scribe_doc.html b/ietf/templates/iesg/scribe_doc.html index 8b48dbfca..c6fd11f61 100644 --- a/ietf/templates/iesg/scribe_doc.html +++ b/ietf/templates/iesg/scribe_doc.html @@ -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 %} diff --git a/ietf/templates/ipr/details_base.html b/ietf/templates/ipr/details_base.html index bfbddafe8..60819c681 100644 --- a/ietf/templates/ipr/details_base.html +++ b/ietf/templates/ipr/details_base.html @@ -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 %} diff --git a/ietf/templates/ipr/search_doctitle_result.html b/ietf/templates/ipr/search_doctitle_result.html index 56b86d89d..c513e7335 100644 --- a/ietf/templates/ipr/search_doctitle_result.html +++ b/ietf/templates/ipr/search_doctitle_result.html @@ -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>