From b72c8a7cfd635ad82faa714f899986a629e3bfc7 Mon Sep 17 00:00:00 2001 From: Adam Roach Date: Sat, 2 Nov 2013 18:42:11 +0000 Subject: [PATCH] Ticket #1153: Fixes IPR disclosures being counted multiple times and counting of "not yet approved" IPR disclosures. - Legacy-Id: 6613 --- ietf/doc/models.py | 5 +++-- ietf/templates/doc/document_draft.html | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ietf/doc/models.py b/ietf/doc/models.py index ae6cbcac7..3a99f6fa5 100644 --- a/ietf/doc/models.py +++ b/ietf/doc/models.py @@ -402,8 +402,9 @@ class Document(DocumentInfo): document directly or indirectly obsoletes or replaces """ from ietf.ipr.models import IprDocAlias - return IprDocAlias.objects.filter(doc_alias__in=list(self.docalias_set.all())+self.all_related_that_doc(['obs','replaces'])) - + aliases = IprDocAlias.objects.filter(doc_alias__in=list(self.docalias_set.all())+self.all_related_that_doc(['obs','replaces'])).filter(ipr__status__in=[1,3]) + disclosures = list(set([x.ipr for x in aliases])) + return disclosures class RelatedDocHistory(models.Model): source = models.ForeignKey('DocHistory') diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html index d5eb3bd1a..2cca46f80 100644 --- a/ietf/templates/doc/document_draft.html +++ b/ietf/templates/doc/document_draft.html @@ -226,7 +226,7 @@
Email Authors - | IPR Disclosures{% if doc.related_ipr %} ({{doc.related_ipr.count}}){% endif %} + | IPR Disclosures{% if doc.related_ipr %} ({{doc.related_ipr|length}}){% endif %} | Dependencies to this document | Check nits | History feed