Skip to content

Commit 0f08671

Browse files
fennerfenner
committed
* Switch to /ipr/<ipr-id>/ and /ipr/y/<year>/ urls
 * Add update URLs for each type of disclosure and redirects to match - Legacy-Id: 813
1 parent 6a36609 commit 0f08671

5 files changed

Lines changed: 40 additions & 16 deletions

File tree

‎ietf/ipr/testurl.list‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
# -*- conf-mode -*-
22
200 /ipr/ https://datatracker.ietf.org/public/ipr_list.cgi
3-
200 /ipr/ipr-657/ https://datatracker.ietf.org/public/ipr_detail_show.cgi?&ipr_id=657 # Generic disclosure
4-
200 /ipr/ipr-834/ https://datatracker.ietf.org/public/ipr_detail_show.cgi?&ipr_id=834 # Specific disclosure
5-
200 /ipr/ipr-795/ https://datatracker.ietf.org/public/ipr_detail_show.cgi?&ipr_id=795 # Third-party disclosure
3+
200 /ipr/657/ https://datatracker.ietf.org/public/ipr_detail_show.cgi?&ipr_id=657 # Generic disclosure
4+
200 /ipr/834/ https://datatracker.ietf.org/public/ipr_detail_show.cgi?&ipr_id=834 # Specific disclosure
5+
200 /ipr/795/ https://datatracker.ietf.org/public/ipr_detail_show.cgi?&ipr_id=795 # Third-party disclosure
66
200 /ipr/new-generic/ https://datatracker.ietf.org/public/ipr_generic.cgi
77
200 /ipr/new-specific/ https://datatracker.ietf.org/public/ipr.cgi
88
200 /ipr/new-third-party/ https://datatracker.ietf.org/public/ipr_notify.cgi
99
200 /ipr/update/ https://datatracker.ietf.org/public/ipr_update_list.cgi
1010

1111
200 /ipr/update/657/ https://datatracker.ietf.org/public/ipr_generic.cgi?command=update_ipr&ipr_id=657
12+
200 /ipr/update/820/ https://datatracker.ietf.org/public/ipr_notify.cgi?command=update_ipr&ipr_id=820
13+
200 /ipr/update/844/ https://datatracker.ietf.org/public/ipr.cgi?command=update_ipr&ipr_id=844
1214

1315
200 /ipr/search/ https://datatracker.ietf.org/public/ipr_search.cgi
1416
302 /ipr/search/?option=document_search # incomplete argument set gives redirect
@@ -44,6 +46,6 @@
4446

4547

4648
200 /ipr/about/ https://datatracker.ietf.org/public/ipr_disclosure.cgi
47-
200 /ipr/2006/
48-
200 /ipr/2006/feb/
49+
200 /ipr/y/2006/
50+
200 /ipr/y/2006/feb/
4951
200 /ipr/by-date/

‎ietf/ipr/urls.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
urlpatterns = patterns('',
77
(r'^$', views.showlist),
88
(r'^about/$', views.default),
9-
(r'^ipr-(?P<ipr_id>\d+)/$', views.show),
9+
(r'^(?P<ipr_id>\d+)/$', views.show),
1010
(r'^update/$', views.updatelist),
1111
(r'^update/(?P<ipr_id>\d+)/$', new.update),
1212
(r'^new-(?P<type>specific)/$', new.new),
@@ -20,8 +20,8 @@
2020

2121
urlpatterns += patterns('django.views.generic.date_based',
2222
(r'^by-date/$', 'archive_index', archive),
23-
(r'^(?P<year>\d{4})/$', 'archive_year', archive),
24-
(r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/$', 'archive_month', archive),
23+
(r'^y/(?P<year>\d{4})/$', 'archive_year', archive),
24+
(r'^y/(?P<year>\d{4})/(?P<month>[a-z]{3})/$', 'archive_month', archive),
2525
)
2626

2727

‎ietf/redirects/fixtures/initial_data.xml‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,20 +116,20 @@
116116
</object>
117117
<object pk="20" model="redirects.redirect">
118118
<field type="CharField" name="cgi">public/ipr_generic.cgi</field>
119-
<field type="CharField" name="url">ipr/new-generic</field>
120-
<field type="CharField" name="rest"></field>
119+
<field type="CharField" name="url">ipr</field>
120+
<field type="CharField" name="rest">new-generic</field>
121121
<field type="CharField" name="remove"></field>
122122
</object>
123123
<object pk="21" model="redirects.redirect">
124124
<field type="CharField" name="cgi">public/ipr_notify.cgi</field>
125-
<field type="CharField" name="url">ipr/new-third-party</field>
126-
<field type="CharField" name="rest"></field>
125+
<field type="CharField" name="url">ipr</field>
126+
<field type="CharField" name="rest">new-third-party</field>
127127
<field type="CharField" name="remove"></field>
128128
</object>
129129
<object pk="22" model="redirects.redirect">
130130
<field type="CharField" name="cgi">public/ipr.cgi</field>
131-
<field type="CharField" name="url">ipr/new-specific</field>
132-
<field type="CharField" name="rest"></field>
131+
<field type="CharField" name="url">ipr</field>
132+
<field type="CharField" name="rest">new-specific</field>
133133
<field type="CharField" name="remove"></field>
134134
</object>
135135
<object pk="23" model="redirects.redirect">
@@ -318,6 +318,24 @@
318318
<field to="redirects.redirect" name="script" rel="ManyToOneRel">7</field>
319319
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel">8</field>
320320
</object>
321+
<object pk="21" model="redirects.command">
322+
<field type="CharField" name="command">update_ipr</field>
323+
<field type="CharField" name="url">update</field>
324+
<field to="redirects.redirect" name="script" rel="ManyToOneRel">20</field>
325+
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel">9</field>
326+
</object>
327+
<object pk="22" model="redirects.command">
328+
<field type="CharField" name="command">update_ipr</field>
329+
<field type="CharField" name="url">update</field>
330+
<field to="redirects.redirect" name="script" rel="ManyToOneRel">22</field>
331+
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel">9</field>
332+
</object>
333+
<object pk="23" model="redirects.command">
334+
<field type="CharField" name="command">update_ipr</field>
335+
<field type="CharField" name="url">update</field>
336+
<field to="redirects.redirect" name="script" rel="ManyToOneRel">21</field>
337+
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel">9</field>
338+
</object>
321339
<object pk="2" model="redirects.suffix">
322340
<field type="CharField" name="rest">%(fl)s</field>
323341
<field type="CharField" name="remove"></field>
@@ -342,4 +360,8 @@
342360
<field type="CharField" name="rest">%(id)s/related</field>
343361
<field type="CharField" name="remove"></field>
344362
</object>
363+
<object pk="9" model="redirects.suffix">
364+
<field type="CharField" name="rest">%(ipr_id)s</field>
365+
<field type="CharField" name="remove"></field>
366+
</object>
345367
</django-objects>

‎ietf/templates/ipr/iprdetail_archive.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h4>{{ year.grouper }}</h4>
2222
<h3>Archives by Year</h3>
2323
<ul>
2424
{% for year in date_list %}
25-
<li><a href="/ipr/{{ year|date:"Y" }}/">{{ year|date:"Y" }}</a>
25+
<li><a href="/ipr/y/{{ year|date:"Y" }}/">{{ year|date:"Y" }}</a>
2626
{% endfor %}
2727
</ul>
2828

‎ietf/templates/ipr/iprdetail_archive_year.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{% block content %}
77
<h2>IPR Declarations - {{ year }}</h2>
88

9-
<a href="../">All dates</a>
9+
<a href="../../">All dates</a>
1010

1111
<ul>
1212
{% for month in date_list %}

0 commit comments

Comments
 (0)