diff --git a/dev/build/Dockerfile b/dev/build/Dockerfile index e7cc510bc7..bede86fac9 100644 --- a/dev/build/Dockerfile +++ b/dev/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/ietf-tools/datatracker-app-base:latest +FROM ghcr.io/ietf-tools/datatracker-app-base:2024102800 LABEL maintainer="IETF Tools Team " ENV DEBIAN_FRONTEND=noninteractive diff --git a/ietf/ipr/tests.py b/ietf/ipr/tests.py index d72018f10b..67be278dbb 100644 --- a/ietf/ipr/tests.py +++ b/ietf/ipr/tests.py @@ -32,7 +32,8 @@ GenericIprDisclosureFactory, IprDisclosureBaseFactory, IprDocRelFactory, - IprEventFactory + IprEventFactory, + ThirdPartyIprDisclosureFactory ) from ietf.ipr.forms import DraftForm, HolderIprDisclosureForm from ietf.ipr.mail import (process_response_email, get_reply_to, get_update_submitter_emails, @@ -104,9 +105,26 @@ def test_get_update_submitter_emails(self): self.assertTrue(messages[0].startswith('To: %s' % ipr.submitter_email)) def test_showlist(self): - ipr = HolderIprDisclosureFactory() - r = self.client.get(urlreverse("ietf.ipr.views.showlist")) - self.assertContains(r, ipr.title) + for disc_factory_type in (HolderIprDisclosureFactory, GenericIprDisclosureFactory, ThirdPartyIprDisclosureFactory): + ipr = disc_factory_type(state_id="removed") + r = self.client.get(urlreverse("ietf.ipr.views.showlist")) + self.assertContains(r, ipr.title) + self.assertContains(r, "removed at the request of the submitter") + self.assertNotContains(r, "removed as objectively false") + ipr.state_id="posted" + ipr.save() + r = self.client.get(urlreverse("ietf.ipr.views.showlist")) + self.assertContains(r, ipr.title) + self.assertNotContains(r, "removed at the request of the submitter") + self.assertNotContains(r, "removed as objectively false") + ipr.state_id="removed_objfalse" + ipr.save() + r = self.client.get(urlreverse("ietf.ipr.views.showlist")) + self.assertContains(r, ipr.title) + self.assertNotContains(r, "removed at the request of the submitter") + self.assertContains(r, "removed as objectively false") + ipr.delete() + def test_show_posted(self): ipr = HolderIprDisclosureFactory() diff --git a/ietf/templates/ipr/ipr_table.html b/ietf/templates/ipr/ipr_table.html index ce3982c987..d8247ea587 100644 --- a/ietf/templates/ipr/ipr_table.html +++ b/ietf/templates/ipr/ipr_table.html @@ -39,10 +39,13 @@ {% endif %} {% endfor %} - {% else %} + {% elif ipr.state_id == 'removed' %}
{{ ipr.title }}
This IPR disclosure was removed at the request of the submitter. - {% endif %} + {% elif ipr.state_id == 'removed_objfalse' %} +
{{ ipr.title }}
+ This IPR disclosure was removed as objectively false. + {% endif %} {# Intentionally not emitting anything for any other states #} {% if administrative_list == 'pending' %} {% with ipr.get_latest_event_msgout as latest_msgout %}