/ipr/: remove separate list for updating

 - Legacy-Id: 2120

Author: pasieronen

ietf/ipr/testurl.list

@@ -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	

ietf/ipr/urls.py

@@ -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),

ietf/ipr/views.py

@@ -11,27 +11,17 @@
 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', ] ),

ietf/templates/ipr/details.html

@@ -84,7 +84,10 @@ <h1>{{ ipr.title|escape }}</h1>
 	 {% 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 @@ <h1>{{ ipr.title|escape }}</h1>
 	    </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 %}

ietf/templates/ipr/disclosure.html

@@ -23,7 +23,7 @@ <h1>IPR Disclosure Page</h1>
 <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>