/ipr/: remove separate list for updating
- Legacy-Id: 2120
This commit is contained in:
Pasi Eronen
parent
58a6dc0b85
commit
b8ca53052c
|
|
@ -20,7 +20,7 @@
|
|||
200 /ipr/new-specific/?_testpost=1
|
||||
200 /ipr/new-third-party/?_testpost=1
|
||||
|
||||
200 /ipr/update/
|
||||
301 /ipr/update/
|
||||
200 /ipr/update/657/ # Generic
|
||||
200 /ipr/update/820/ # Third-party
|
||||
200 /ipr/update/844/ # Specific
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
from django.conf.urls.defaults import patterns
|
||||
from ietf.ipr import views, new, search
|
||||
from django.views.generic.simple import redirect_to
|
||||
|
||||
urlpatterns = patterns('',
|
||||
(r'^$', views.showlist),
|
||||
(r'^about/$', views.default),
|
||||
(r'^by-draft/$', views.list_drafts),
|
||||
#(r'^(?P<removed>removed/)?(?P<ipr_id>\d+)/$', views.show),
|
||||
(r'^(?P<ipr_id>\d+)/$', views.show),
|
||||
(r'^update/$', views.updatelist),
|
||||
(r'^update/$', redirect_to, { 'url': '/ipr/' }),
|
||||
(r'^update/(?P<ipr_id>\d+)/$', new.update),
|
||||
(r'^new-(?P<type>specific)/$', new.new),
|
||||
(r'^new-(?P<type>generic)/$', new.new),
|
||||
|
|
|
|||
|
|
@ -11,27 +11,17 @@ from ietf.ipr.view_sections import section_table
|
|||
from ietf.utils import log
|
||||
import os
|
||||
|
||||
|
||||
def default(request):
|
||||
"""Default page, with links to sub-pages"""
|
||||
return render("ipr/disclosure.html", {}, context_instance=RequestContext(request))
|
||||
|
||||
def showlist(request):
|
||||
"""Display a list of existing disclosures"""
|
||||
return list_all(request, 'ipr/list.html')
|
||||
|
||||
def updatelist(request):
|
||||
"""Display a list of existing disclosures, with links to update forms"""
|
||||
return list_all(request, 'ipr/update_list.html')
|
||||
|
||||
def list_all(request, template):
|
||||
"""Display a list of existing disclosures, using the provided template"""
|
||||
disclosures = IprDetail.objects.all()
|
||||
generic_disclosures = disclosures.filter(status__in=[1,3], generic=1)
|
||||
specific_disclosures = disclosures.filter(status__in=[1,3], generic=0, third_party=0)
|
||||
thirdpty_disclosures = disclosures.filter(status__in=[1,3], generic=0, third_party=1)
|
||||
|
||||
return render(template,
|
||||
return render("ipr/list.html",
|
||||
{
|
||||
'generic_disclosures' : generic_disclosures.order_by(* ['-submitted_date', ] ),
|
||||
'specific_disclosures': specific_disclosures.order_by(* ['-submitted_date', ] ),
|
||||
|
|
|
|||
|
|
@ -84,7 +84,10 @@ Template for {{ section_list.disclosure_type }}" where the submitter provided
|
|||
{% endifequal %}
|
||||
{% endfor %}
|
||||
|
||||
<p>Click <a href="{% url ietf.ipr.new.update ipr.ipr_id %}" rel="nofollow">here</a> to update this IPR disclosure</p>
|
||||
<p><a href="{% url ietf.ipr.new.update ipr.ipr_id %}" rel="nofollow">Update this IPR disclosure</a>. Note: Updates to IPR disclosures must only be made by authorized
|
||||
representatives of the original submitters. Updates will automatically
|
||||
be forwarded to the current Patent Holder's Contact and to the Submitter
|
||||
of the original IPR disclosure.</p>
|
||||
<!-- tag 1 -->
|
||||
<p><strong>Submitted Date: {{ ipr.submitted_date|date:"F j, Y" }}</strong></p>
|
||||
{% endif %}
|
||||
|
|
@ -100,9 +103,7 @@ Template for {{ section_list.disclosure_type }}" where the submitter provided
|
|||
</th>
|
||||
</tr>
|
||||
<tr class="{% cycle row_parity %}">
|
||||
{% block section1_data %}
|
||||
<td class="iprlabel">Legal Name:</td> <td class="iprdata">{{ ipr.legal_name|escape }}</td>
|
||||
{% endblock %}
|
||||
</tr>
|
||||
</table>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<li><a href="{% url ietf.ipr.new.new "specific" %}">File a disclosure about your IPR related to a specific IETF contribution</a></li>
|
||||
<li><a href="{% url ietf.ipr.new.new "generic" %}">File an IPR disclosure that is not related to a specific IETF contribution</a></li>
|
||||
<li><a href="{% url ietf.ipr.new.new "third-party" %}">Notify the IETF of IPR other than your own</a></li>
|
||||
<li><a href="{% url ietf.ipr.views.updatelist %}">Update an existing IPR disclosure</a></li>
|
||||
<li>To update an existing IPR disclosure, find the original disclosure and select "update this IPR disclosure".</li>
|
||||
<li><a href="{% url ietf.ipr.search.search %}">Search the IPR disclosures</a></li>
|
||||
<li><a href="{% url ietf.ipr.views.showlist %}">List of IPR disclosures</a></li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -1,70 +0,0 @@
|
|||
{# Copyright The IETF Trust 2007, All Rights Reserved #}
|
||||
{% extends "base.html" %}
|
||||
{% block title %}IPR Update{% endblock %}
|
||||
{% block content %}
|
||||
|
||||
<h1><center>IPR Disclosure Update Page</H1></center>
|
||||
<a href="{% url ietf.ipr.views.default %}">Click here to submit an IPR disclosure</a>
|
||||
|
||||
<hr><p>
|
||||
<P><a href="{% url ietf.ipr.search.search %}"><img src="/images/blue.gif" hspace="3" border="0">Search the IPR Disclosures</a><p>
|
||||
<P><a href="#generic"><img src="/images/blue.gif" hspace="3" border="0">Generic IPR Disclosures</a><p>
|
||||
|
||||
<P><a href="#specific"><img src="/images/blue.gif" hspace="3" border="0">Specific IPR Disclosures</a><p>
|
||||
<P><a href="#notify"><img src="/images/blue.gif" hspace="3" border="0">Specific Third Party IPR Disclosures</a><p>
|
||||
<hr>
|
||||
|
||||
<a name="generic"></a>
|
||||
<h3>Generic IPR Disclosures</h3>
|
||||
<b><font size = +1>Please select the IPR disclosure that you wish to update.</font><br>
|
||||
Note: Updates to IPR disclosures must only be made by authorized
|
||||
representatives of the original submitters. Updates will automatically
|
||||
be forwarded to the current Patent Holder's Contact and to the Submitter
|
||||
of the original IPR disclosure.</B>
|
||||
<p>
|
||||
<table border="1" cellpadding="2" cellspacing="2" width="820">
|
||||
|
||||
<tr><th width="100">Date Submitted</th><th width="70">ID #</th><th align="center">Title of IPR Disclosure</th></tr>
|
||||
{% for ipr in generic_disclosures %}
|
||||
{% include "ipr/list_item.html" %}
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
<P><a href="#top"><img src="/images/blue.gif" hspace="3" border="0">Back to Top</a><p>
|
||||
<a name="specific"></a>
|
||||
<h3>Specific IPR Disclosures</h3>
|
||||
<b><font size = +1>Please select the IPR disclosure that you wish to update.</font><br>
|
||||
Note: Updates to IPR disclosures must only be made by authorized
|
||||
representatives of the original submitters. Updates will automatically
|
||||
be forwarded to the current Patent Holder's Contact and to the Submitter
|
||||
of the original IPR disclosure.</B>
|
||||
<p>
|
||||
|
||||
<table border="1" cellpadding="2" cellspacing="2" width="820">
|
||||
<tr><th>Date Submitted</th><th width="70">ID #</th><th align="center">Title of IPR Disclosure</th></tr>
|
||||
{% for ipr in specific_disclosures %}
|
||||
{% include "ipr/list_item.html" %}
|
||||
{% endfor %}
|
||||
</table>
|
||||
<br>
|
||||
<P><a href="#top"><img src="/images/blue.gif" hspace="3" border="0">Back to Top</a><p>
|
||||
<a name="notify"></a>
|
||||
<h3>Specific Third Party IPR Disclosures</h3>
|
||||
<b><font size = +1>Please select the IPR disclosure that you wish to update.</font><br>
|
||||
Note: Updates to IPR disclosures must only be made by authorized
|
||||
representatives of the original submitters. Updates will automatically
|
||||
be forwarded to the current Patent Holder's Contact and to the Submitter
|
||||
of the original IPR disclosure.</B>
|
||||
|
||||
<p>
|
||||
|
||||
<table border="1" cellpadding="2" cellspacing="2" width="820">
|
||||
|
||||
<tr><th>Date Submitted</th><th width="70">ID #</th><th align="center">Title of IPR Disclosure</th></tr>
|
||||
{% for ipr in thirdpty_disclosures %}
|
||||
{% include "ipr/list_item.html" %}
|
||||
{% endfor %}
|
||||
</table>
|
||||
|
||||
<br><br><br><br>
|
||||
{% endblock %}
|
||||
Loading…
Reference in a new issue