altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

ci: merge main to release (#8105)

Browse source
This commit is contained in:
Robert Sparks 2024-10-28 15:26:38 -05:00 committed by GitHub
parent 9e46a0581d 9c37f52ee5
commit 4527ac24c7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dev/build/Dockerfile
View file

@ -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 <tools-discuss@ietf.org>" LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive

22
ietf/ipr/tests.py
View file

@ -32,7 +32,8 @@ from ietf.ipr.factories import (
GenericIprDisclosureFactory, GenericIprDisclosureFactory,
IprDisclosureBaseFactory, IprDisclosureBaseFactory,
IprDocRelFactory, IprDocRelFactory,
IprEventFactory IprEventFactory,
ThirdPartyIprDisclosureFactory
) )
from ietf.ipr.forms import DraftForm, HolderIprDisclosureForm from ietf.ipr.forms import DraftForm, HolderIprDisclosureForm
from ietf.ipr.mail import (process_response_email, get_reply_to, get_update_submitter_emails, from ietf.ipr.mail import (process_response_email, get_reply_to, get_update_submitter_emails,
@ -104,9 +105,26 @@ class IprTests(TestCase):
self.assertTrue(messages[0].startswith('To: %s' % ipr.submitter_email)) self.assertTrue(messages[0].startswith('To: %s' % ipr.submitter_email))
def test_showlist(self): def test_showlist(self):
ipr = HolderIprDisclosureFactory() for disc_factory_type in (HolderIprDisclosureFactory, GenericIprDisclosureFactory, ThirdPartyIprDisclosureFactory):
ipr = disc_factory_type(state_id="removed")
r = self.client.get(urlreverse("ietf.ipr.views.showlist")) r = self.client.get(urlreverse("ietf.ipr.views.showlist"))
self.assertContains(r, ipr.title) 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): def test_show_posted(self):
ipr = HolderIprDisclosureFactory() ipr = HolderIprDisclosureFactory()

7
ietf/templates/ipr/ipr_table.html
View file

@ -39,10 +39,13 @@
</small> </small>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% else %} {% elif ipr.state_id == 'removed' %}
<div>{{ ipr.title }}</div> <div>{{ ipr.title }}</div>
<small><i>This IPR disclosure was removed at the request of the submitter.</i></small> <small><i>This IPR disclosure was removed at the request of the submitter.</i></small>
{% endif %} {% elif ipr.state_id == 'removed_objfalse' %}
<div>{{ ipr.title }}</div>
<small><i>This IPR disclosure was removed as objectively false.</i></small>
{% endif %} {# Intentionally not emitting anything for any other states #}
</td> </td>
{% if administrative_list == 'pending' %} {% if administrative_list == 'pending' %}
{% with ipr.get_latest_event_msgout as latest_msgout %} {% with ipr.get_latest_event_msgout as latest_msgout %}