From 40cef39caeb8c6da51f76d6390670f97125c5be9 Mon Sep 17 00:00:00 2001
From: Russ Housley <housley@vigilsec.com>
Date: Sat, 16 Jul 2016 12:17:38 +0000
Subject: [PATCH] Do not show updates related to a removed IPR disclosure.
Fixes #1983.
Commit ready for merge.
- Legacy-Id: 11666
---
ietf/templates/ipr/ipr_table.html | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/ietf/templates/ipr/ipr_table.html b/ietf/templates/ipr/ipr_table.html
index a363c02bb..63714d424 100644
--- a/ietf/templates/ipr/ipr_table.html
+++ b/ietf/templates/ipr/ipr_table.html
@@ -21,22 +21,23 @@
<td>
{% if ipr.state_id == 'posted' or administrative_list %}
<div><a href="{% url "ietf.ipr.views.show" ipr.id %}">{{ ipr.title }}</a></div>
+
+ {% for item in ipr.relatedipr_source_set.all %}
+ {% if item.target.state_id == 'posted' %}
+ <div>Updates ID <a href="{% url "ietf.ipr.views.show" item.target.id %}">#{{ item.target.id }}</a>.</div>
+ {% endif %}
+ {% endfor %}
+
+ {% for item in ipr.relatedipr_target_set.all %}
+ {% if item.source.state_id == "posted" %}
+ <div>Updated by ID <a href="{% url "ietf.ipr.views.show" item.source.id %}">#{{ item.source.id }}</a>.</div>
+ {% endif %}
+ {% endfor %}
+
{% else %}
<div>{{ ipr.title }}</div>
<div><i>This IPR disclosure was removed at the request of the submitter.</i></div>
{% endif %}
-
- {% for item in ipr.relatedipr_source_set.all %}
- {% if item.target.state_id == 'posted' %}
- <div>Updates ID <a href="{% url "ietf.ipr.views.show" item.target.id %}">#{{ item.target.id }}</a>.</div>
- {% endif %}
- {% endfor %}
-
- {% for item in ipr.relatedipr_target_set.all %}
- {% if item.source.state_id == "posted" %}
- <div>Updated by ID <a href="{% url "ietf.ipr.views.show" item.source.id %}">#{{ item.source.id }}</a>.</div>
- {% endif %}
- {% endfor %}
</td>
{% if administrative_list == 'pending' %}