Fixing some renaming breakage.
- Legacy-Id: 479
This commit is contained in:
parent
7075fe65a0
commit
f051f64977
|
@ -111,7 +111,7 @@ class IprDetail(models.Model):
|
||||||
update_notified_date = models.DateField(null=True, blank=True)
|
update_notified_date = models.DateField(null=True, blank=True)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.document_title
|
return self.title
|
||||||
def get_absolute_url(self):
|
def get_absolute_url(self):
|
||||||
return "/ipr/ipr-%s" % self.ipr_id
|
return "/ipr/ipr-%s" % self.ipr_id
|
||||||
class Meta:
|
class Meta:
|
||||||
|
|
|
@ -177,13 +177,13 @@ def new(request, type):
|
||||||
data["comply"] = "1"
|
data["comply"] = "1"
|
||||||
|
|
||||||
if type == "general":
|
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":
|
if type == "specific":
|
||||||
data["ipr_summary"] = get_ipr_summary(data)
|
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":
|
if type == "third-party":
|
||||||
data["ipr_summary"] = get_ipr_summary(data)
|
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"]:
|
for src in ["hold", "ietf"]:
|
||||||
if "%s_contact_is_submitter" % src in data:
|
if "%s_contact_is_submitter" % src in data:
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
<table cellpadding=0 cellspacing=0 border=0>
|
<table cellpadding=0 cellspacing=0 border=0>
|
||||||
<tr>
|
<tr>
|
||||||
<td width="720" align="center">
|
<td width="720" align="center">
|
||||||
<h3>{{ ipr.document_title }}</h3>
|
<h3>{{ ipr.title }}</h3>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
@ -54,9 +54,9 @@
|
||||||
<br>
|
<br>
|
||||||
This IPR disclosure updates IPR disclosure ID #{{ item.updated.ipr_id }},
|
This IPR disclosure updates IPR disclosure ID #{{ item.updated.ipr_id }},
|
||||||
{% ifequal item.status_to_be 1 %}
|
{% ifequal item.status_to_be 1 %}
|
||||||
"<a href="{% url ietf.ipr.views.show item.updated.ipr_id %}">{{ item.updated.document_title }}</a>".
|
"<a href="{% url ietf.ipr.views.show item.updated.ipr_id %}">{{ item.updated.title }}</a>".
|
||||||
{% else %}
|
{% 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 %}
|
{% endifequal %}
|
||||||
<br>
|
<br>
|
||||||
</font>
|
</font>
|
||||||
|
@ -68,9 +68,9 @@
|
||||||
<br>
|
<br>
|
||||||
This IPR disclosure has been updated by IPR disclosure ID #{{ item.ipr.ipr_id }},
|
This IPR disclosure has been updated by IPR disclosure ID #{{ item.ipr.ipr_id }},
|
||||||
{% ifequal item.status_to_be 1 %}
|
{% ifequal item.status_to_be 1 %}
|
||||||
"<a href="{% url ietf.ipr.views.show item.ipr.ipr_id %}">{{ item.ipr.document_title }}</a>".
|
"<a href="{% url ietf.ipr.views.show item.ipr.ipr_id %}">{{ item.ipr.title }}</a>".
|
||||||
{% else %}
|
{% 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 %}
|
{% endifequal %}
|
||||||
<br>
|
<br>
|
||||||
</font>
|
</font>
|
||||||
|
|
|
@ -3,9 +3,9 @@
|
||||||
<td align="right">{{ ipr.ipr_id }}</td>
|
<td align="right">{{ ipr.ipr_id }}</td>
|
||||||
<td>
|
<td>
|
||||||
{% ifequal ipr.status 1 %}
|
{% ifequal ipr.status 1 %}
|
||||||
<a href="{% url ietf.ipr.views.show ipr.ipr_id %}">{{ ipr.document_title }}</a>
|
<a href="{% url ietf.ipr.views.show ipr.ipr_id %}">{{ ipr.title }}</a>
|
||||||
{% else %}
|
{% else %}
|
||||||
{{ ipr.document_title }}
|
{{ ipr.title }}
|
||||||
<br>This IPR disclosure was removed at the request of the submitter.
|
<br>This IPR disclosure was removed at the request of the submitter.
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
<br />
|
<br />
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
<tr valign="top" bgcolor="#dadada">
|
<tr valign="top" bgcolor="#dadada">
|
||||||
<td width="100">{{ ipr.submitted_date }}</td>
|
<td width="100">{{ ipr.submitted_date }}</td>
|
||||||
<td width="90"><li>ID # {{ ipr.ipr_id }}</li></td>
|
<td width="90"><li>ID # {{ ipr.ipr_id }}</li></td>
|
||||||
<td><a href="{% url ietf.ipr.views.show ipr_id=ipr.ipr_id %}">"{{ ipr.document_title }}"</a></td>
|
<td><a href="{% url ietf.ipr.views.show ipr_id=ipr.ipr_id %}">"{{ ipr.title }}"</a></td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@
|
||||||
<tr valign="top">
|
<tr valign="top">
|
||||||
<td width="100">{{ ipr.submitted_date }}</td>
|
<td width="100">{{ ipr.submitted_date }}</td>
|
||||||
<td width="90"><li>ID # {{ ipr.ipr_id }}</li></td>
|
<td width="90"><li>ID # {{ ipr.ipr_id }}</li></td>
|
||||||
<td><a href="{% url ietf.ipr.views.show %}{{ ipr.ipr_id }}">"{{ ipr.document_title }}"</a></td>
|
<td><a href="{% url ietf.ipr.views.show %}{{ ipr.ipr_id }}">"{{ ipr.title }}"</a></td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% else %}
|
{% else %}
|
||||||
|
|
Loading…
Reference in a new issue