Fixed bad logic for the display of previous related IPR informatio in the IPR details template.
- Legacy-Id: 16291
This commit is contained in:
Henrik Levkowetz
parent
ac73bd6223
commit
84a80e99a8
|
|
@ -124,11 +124,13 @@
|
|||
Patent Holder/Applicant ("Patent Holder")</h2>
|
||||
|
||||
<table class="table-condensed col-md-12">
|
||||
{% if prev and prev.state.slug == "posted" %}
|
||||
{% if prev %}
|
||||
{% if prev.state.slug == "posted" %}
|
||||
<tr><th class="ipr-prev">Previous (<a href="{% url "ietf.ipr.views.show" id=prev.id %}">#{{prev.id}}</a>)</th><th></th><th>This (#{{ipr.id}})</th></tr>
|
||||
{% else %}
|
||||
<tr><th class="ipr-prev">Previous (#{{prev.id}}, {{prev.state}})</th><th></th><th>This (#{{ipr.id}})</th></tr>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
<tr>
|
||||
{% if prev %}<td class="col-md-5 ipr-prev">{{ prev.holder_legal_name }}</td>{% endif %}
|
||||
<th class="col-md-2 ipr-label">Holder legal name</th>
|
||||
|
|
@ -140,11 +142,13 @@
|
|||
<h2>{% cycle section %}. Patent Holder's Contact for Licence Application</h2>
|
||||
|
||||
<table class="table-condensed col-md-12">
|
||||
{% if prev and prev.state.slug == "posted" %}
|
||||
{% if prev %}
|
||||
{% if prev.state.slug == "posted" %}
|
||||
<tr><th class="ipr-prev">Previous (<a href="{% url "ietf.ipr.views.show" id=prev.id %}">#{{prev.id}}</a>)</th><th></th><th>This (#{{ipr.id}})</th></tr>
|
||||
{% else %}
|
||||
<tr><th class="ipr-prev">Previous (#{{prev.id}}, {{prev.state}})</th><th></th><th>This (#{{ipr.id}})</th></tr>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
<tr>
|
||||
{% if prev %}<td class="col-md-5 ipr-prev">{{ prev.holder_contact_name }}</td>{% endif %}
|
||||
|
|
@ -171,11 +175,13 @@
|
|||
<h2>{% cycle section %}. Contact Information for the IETF Participant Whose Personal Belief Triggered this Disclosure</h2>
|
||||
|
||||
<table class="table-condensed col-md-12">
|
||||
{% if prev and prev.state.slug == "posted" %}
|
||||
{% if prev %}
|
||||
{% if prev.state.slug == "posted" %}
|
||||
<tr><th class="ipr-prev">Previous (<a href="{% url "ietf.ipr.views.show" id=prev.id %}">#{{prev.id}}</a>)</th><th></th><th>This (#{{ipr.id}})</th></tr>
|
||||
{% else %}
|
||||
<tr><th class="ipr-prev">Previous (#{{prev.id}}, {{prev.state}})</th><th></th><th>This (#{{ipr.id}})</th></tr>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
<tr>
|
||||
{% if prev %}<td class="col-md-5 ipr-prev">{{ prev.ietfer_name }}</td>{% endif %}
|
||||
<th class="col-md-2 ipr-label">Name</th>
|
||||
|
|
@ -201,11 +207,13 @@
|
|||
<h2>{% cycle section %}. IETF Document or Other Contribution to Which this IPR Disclosure Relates</h2>
|
||||
|
||||
<table class="table-condensed col-md-12">
|
||||
{% if prev and prev.state.slug == "posted" %}
|
||||
{% if prev %}
|
||||
{% if prev.state.slug == "posted" %}
|
||||
<tr><th class="ipr-prev">Previous (<a href="{% url "ietf.ipr.views.show" id=prev.id %}">#{{prev.id}}</a>)</th><th></th><th>This (#{{ipr.id}})</th></tr>
|
||||
{% else %}
|
||||
<tr><th class="ipr-prev">Previous (#{{prev.id}}, {{prev.state}})</th><th></th><th>This (#{{ipr.id}})</th></tr>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
<tr>
|
||||
|
||||
{% if prev %}
|
||||
|
|
@ -261,11 +269,13 @@
|
|||
<p>A. For granted patents or published pending patent applications, please provide the following information:</p>
|
||||
|
||||
<table class="table-condensed col-md-12">
|
||||
{% if prev and prev.state.slug == "posted" %}
|
||||
{% if prev %}
|
||||
{% if prev.state.slug == "posted" %}
|
||||
<tr><th class="ipr-prev">Previous (<a href="{% url "ietf.ipr.views.show" id=prev.id %}">#{{prev.id}}</a>)</th><th></th><th>This (#{{ipr.id}})</th></tr>
|
||||
{% else %}
|
||||
<tr><th class="ipr-prev">Previous (#{{prev.id}}, {{prev.state}})</th><th></th><th>This (#{{ipr.id}})</th></tr>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
<tr>
|
||||
{% if prev %}<td class="col-md-5 ipr-prev">{{ prev.patent_info|linebreaks }}</td>{% endif %}
|
||||
<th class="col-md-2 ipr-label">Patent, Serial, Publication, Registration, or Application/File number(s)</th>
|
||||
|
|
@ -276,11 +286,13 @@
|
|||
<p>B. Does this disclosure relate to an unpublished pending patent application?:</p>
|
||||
|
||||
<table class="table-condensed col-md-12">
|
||||
{% if prev and prev.state.slug == "posted" %}
|
||||
{% if prev %}
|
||||
{% if prev.state.slug == "posted" %}
|
||||
<tr><th class="ipr-prev">Previous (<a href="{% url "ietf.ipr.views.show" id=prev.id %}">#{{prev.id}}</a>)</th><th></th><th>This (#{{ipr.id}})</th></tr>
|
||||
{% else %}
|
||||
<tr><th class="ipr-prev">Previous (#{{prev.id}}, {{prev.state}})</th><th></th><th>This (#{{ipr.id}})</th></tr>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
<tr>
|
||||
{% if prev %}<td class="col-md-5 ipr-prev">{{ prev.has_patent_pending|yesno:"Yes,No" }}</td>{% endif %}
|
||||
<th class="col-md-2 ipr-label">Has patent pending</th>
|
||||
|
|
@ -313,11 +325,13 @@
|
|||
{% endif %}
|
||||
|
||||
<table class="table-condensed col-md-12">
|
||||
{% if prev and prev.state.slug == "posted" %}
|
||||
{% if prev %}
|
||||
{% if prev.state.slug == "posted" %}
|
||||
<tr><th class="ipr-prev">Previous (<a href="{% url "ietf.ipr.views.show" id=prev.id %}">#{{prev.id}}</a>)</th><th></th><th>This (#{{ipr.id}})</th></tr>
|
||||
{% else %}
|
||||
<tr><th class="ipr-prev">Previous (#{{prev.id}}, {{prev.state}})</th><th></th><th>This (#{{ipr.id}})</th></tr>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
<tr>
|
||||
{% if prev %}<td class="col-md-5 ipr-prev">{% if prev.licensing.slug == "provided-later" %}{{ prev.licensing.desc|slice:"2:"|slice:":117" }}){% else %}{{ prev.licensing.desc|slice:"2:" }}{% endif %}</td>{% endif %}
|
||||
<th class="col-md-2 ipr-label">Licensing</th>
|
||||
|
|
@ -338,11 +352,13 @@
|
|||
<h2>{% cycle section %}. Statement</h2>
|
||||
|
||||
<table class="table-condensed col-md-12">
|
||||
{% if prev and prev.state.slug == "posted" %}
|
||||
{% if prev %}
|
||||
{% if prev.state.slug == "posted" %}
|
||||
<tr><th class="ipr-prev">Previous (<a href="{% url "ietf.ipr.views.show" id=prev.id %}">#{{prev.id}}</a>)</th><th></th><th>This (#{{ipr.id}})</th></tr>
|
||||
{% else %}
|
||||
<tr><th class="ipr-prev">Previous (#{{prev.id}}, {{prev.state}})</th><th></th><th>This (#{{ipr.id}})</th></tr>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
<tr>
|
||||
{% if prev %}<td class="col-md-5 ipr-prev">{{ prev.statement|linebreaks }}</td>{% endif %}
|
||||
<th class="col-md-2 ipr-label">Statement</th>
|
||||
|
|
@ -354,11 +370,13 @@
|
|||
<h2>{% cycle section %}. Contact Information of Submitter of this Form</h2>
|
||||
|
||||
<table class="table-condensed col-md-12">
|
||||
{% if prev and prev.state.slug == "posted" %}
|
||||
{% if prev %}
|
||||
{% if prev.state.slug == "posted" %}
|
||||
<tr><th class="ipr-prev">Previous (<a href="{% url "ietf.ipr.views.show" id=prev.id %}">#{{prev.id}}</a>)</th><th></th><th>This (#{{ipr.id}})</th></tr>
|
||||
{% else %}
|
||||
<tr><th class="ipr-prev">Previous (#{{prev.id}}, {{prev.state}})</th><th></th><th>This (#{{ipr.id}})</th></tr>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
<tr>
|
||||
{% if prev %}<td class="col-md-5 ipr-prev">{{ prev.submitter_name }}</td>{% endif %}
|
||||
<th class="col-md-2 ipr-label">Submitter name</th>
|
||||
|
|
@ -376,11 +394,13 @@
|
|||
<h2>{% cycle section %}. Other Notes</h2>
|
||||
|
||||
<table class="table-condensed col-md-12">
|
||||
{% if prev and prev.state.slug == "posted" %}
|
||||
{% if prev %}
|
||||
{% if prev.state.slug == "posted" %}
|
||||
<tr><th class="ipr-prev">Previous (<a href="{% url "ietf.ipr.views.show" id=prev.id %}">#{{prev.id}}</a>)</th><th></th><th>This (#{{ipr.id}})</th></tr>
|
||||
{% else %}
|
||||
<tr><th class="ipr-prev">Previous (#{{prev.id}}, {{prev.state}})</th><th></th><th>This (#{{ipr.id}})</th></tr>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
<tr>
|
||||
{% if prev %}<td class="col-md-5 ipr-prev">{{ prev.notes|linebreaks }}</td>{% endif %}
|
||||
<th class="col-md-2 ipr-label">Additional notes</th>
|
||||
|
|
|
|||
Loading…
Reference in a new issue