diff --git a/ietf/ipr/models.py b/ietf/ipr/models.py index 8e2dba4f5..b34f62862 100644 --- a/ietf/ipr/models.py +++ b/ietf/ipr/models.py @@ -111,7 +111,7 @@ class IprDetail(models.Model): update_notified_date = models.DateField(null=True, blank=True) def __str__(self): - return self.document_title + return self.title def get_absolute_url(self): return "/ipr/ipr-%s" % self.ipr_id class Meta: diff --git a/ietf/ipr/new.py b/ietf/ipr/new.py index ff9bc2465..953ca5136 100644 --- a/ietf/ipr/new.py +++ b/ietf/ipr/new.py @@ -177,13 +177,13 @@ def new(request, type): data["comply"] = "1" if type == "general": - data["document_title"] = """%(legal_name)s's General License Statement""" % data + data["title"] = """%(legal_name)s's General License Statement""" % data if type == "specific": data["ipr_summary"] = get_ipr_summary(data) - data["document_title"] = """%(legal_name)s's Statement about IPR related to %(ipr_summary)s""" % data + data["title"] = """%(legal_name)s's Statement about IPR related to %(ipr_summary)s""" % data if type == "third-party": data["ipr_summary"] = get_ipr_summary(data) - data["document_title"] = """%(submitter)s's Statement about IPR related to %(ipr_summary)s belonging to %(legal_name)s""" % data + data["title"] = """%(submitter)s's Statement about IPR related to %(ipr_summary)s belonging to %(legal_name)s""" % data for src in ["hold", "ietf"]: if "%s_contact_is_submitter" % src in data: diff --git a/ietf/templates/ipr/details.html b/ietf/templates/ipr/details.html index d457179be..c80c07e0c 100644 --- a/ietf/templates/ipr/details.html +++ b/ietf/templates/ipr/details.html @@ -14,7 +14,7 @@
-

{{ ipr.document_title }}

+

{{ ipr.title }}

@@ -54,9 +54,9 @@
This IPR disclosure updates IPR disclosure ID #{{ item.updated.ipr_id }}, {% ifequal item.status_to_be 1 %} - "{{ item.updated.document_title }}". + "{{ item.updated.title }}". {% else %} - "{{ item.updated.document_title }}", which was removed at the request of the submitter. + "{{ item.updated.title }}", which was removed at the request of the submitter. {% endifequal %}
@@ -68,9 +68,9 @@
This IPR disclosure has been updated by IPR disclosure ID #{{ item.ipr.ipr_id }}, {% ifequal item.status_to_be 1 %} - "{{ item.ipr.document_title }}". + "{{ item.ipr.title }}". {% else %} - "{{ item.ipr.document_title }}", which was removed at the request of the submitter. + "{{ item.ipr.title }}", which was removed at the request of the submitter. {% endifequal %}
diff --git a/ietf/templates/ipr/list_item.html b/ietf/templates/ipr/list_item.html index fd6783058..91722bbd2 100644 --- a/ietf/templates/ipr/list_item.html +++ b/ietf/templates/ipr/list_item.html @@ -3,9 +3,9 @@ {{ ipr.ipr_id }} {% ifequal ipr.status 1 %} - {{ ipr.document_title }} + {{ ipr.title }} {% else %} - {{ ipr.document_title }} + {{ ipr.title }}
This IPR disclosure was removed at the request of the submitter. {% endifequal %}
diff --git a/ietf/templates/ipr/search_doc_result.html b/ietf/templates/ipr/search_doc_result.html index 14aadfdab..32f7bee21 100644 --- a/ietf/templates/ipr/search_doc_result.html +++ b/ietf/templates/ipr/search_doc_result.html @@ -16,7 +16,7 @@ {{ ipr.submitted_date }}
  • ID # {{ ipr.ipr_id }}
  • - "{{ ipr.document_title }}" + "{{ ipr.title }}" {% endfor %} @@ -34,7 +34,7 @@ {{ ipr.submitted_date }}
  • ID # {{ ipr.ipr_id }}
  • - "{{ ipr.document_title }}" + "{{ ipr.title }}" {% endfor %} {% else %}