Skip to content

Commit 8d6b0ba

Browse files
fennerfenner
committed
Moves:
 * announcements -> ann * liaisons -> liaison * idindex -> drafts * mailinglists -> list I checked the tests and used a link checker locally, so hopefully the fallout will be minimal. - Legacy-Id: 657
1 parent 7ba839a commit 8d6b0ba

28 files changed

Lines changed: 136 additions & 147 deletions

‎ietf/announcements/testurl.list‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
200 /announcements/nomcom/1230/ https://datatracker.ietf.org/public/show_nomcom_message.cgi?id=1230
1+
200 /ann/nomcom/1230/ https://datatracker.ietf.org/public/show_nomcom_message.cgi?id=1230

‎ietf/idindex/testurl.list‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
200 /idindex/wgdocs/1041/ https://datatracker.ietf.org/public/idindex.cgi?command=show_wg_id&id=1041
2-
skipredirect,200 /idindex/wgdocs/idr/ https://datatracker.ietf.org/public/idindex.cgi?command=show_wg_id&id=1041
3-
200 /idindex/wglist/I/ https://datatracker.ietf.org/public/idindex.cgi?command=show_wg&fl=I
4-
200 /idindex/inddocs/F/ https://datatracker.ietf.org/public/idindex.cgi?command=show_ind_id&fl=F
5-
200 /idindex/otherdocs/tools/ https://datatracker.ietf.org/public/idindex.cgi?command=show_other&cat=tools
6-
200 /idindex/showdocs/rfc/name/ https://datatracker.ietf.org/public/idindex.cgi?command=show_list&cat=rfc&sort=name
7-
skip,200 /idindex/9574/view_related_docs/ https://datatracker.ietf.org/public/idindex.cgi?command=view_related_docs&id=9574
8-
200 /idindex/draft-ietf-dnsext-dnssec-protocol/view_related_docs/
9-
200 /idindex/9574/ https://datatracker.ietf.org/public/idindex.cgi?command=id_detail&id=9574
10-
skipredirect,200 /idindex/draft-ietf-dnsext-dnssec-protocol/ https://datatracker.ietf.org/public/idindex.cgi?command=id_detail&id=9574
11-
200 /idindex/all_id_txt.html
12-
200 /idindex/all_id.html
13-
skipdiff,200 /idindex/ https://datatracker.ietf.org/public/idindex.cgi?command=search_id
14-
200 /idindex/ https://datatracker.ietf.org/public/idindex.cgi
1+
200 /drafts/wg/1041/ https://datatracker.ietf.org/public/idindex.cgi?command=show_wg_id&id=1041
2+
skipredirect,200 /drafts/wg/idr/ https://datatracker.ietf.org/public/idindex.cgi?command=show_wg_id&id=1041
3+
200 /drafts/wg/I/ https://datatracker.ietf.org/public/idindex.cgi?command=show_wg&fl=I
4+
200 /drafts/ind/F/ https://datatracker.ietf.org/public/idindex.cgi?command=show_ind_id&fl=F
5+
200 /drafts/other/tools/ https://datatracker.ietf.org/public/idindex.cgi?command=show_other&cat=tools
6+
200 /drafts/rfc/?sort=name https://datatracker.ietf.org/public/idindex.cgi?command=show_list&cat=rfc&sort=name
7+
skipdiff,200 /drafts/9574/related/ https://datatracker.ietf.org/public/idindex.cgi?command=view_related_docs&id=9574
8+
200 /drafts/draft-ietf-dnsext-dnssec-protocol/related/
9+
200 /drafts/9574/ https://datatracker.ietf.org/public/idindex.cgi?command=id_detail&id=9574
10+
skipredirect,200 /drafts/draft-ietf-dnsext-dnssec-protocol/ https://datatracker.ietf.org/public/idindex.cgi?command=id_detail&id=9574
11+
200 /drafts/all_id_txt.html
12+
200 /drafts/all_id.html
13+
skipdiff,200 /drafts/ https://datatracker.ietf.org/public/idindex.cgi?command=search_id
14+
200 /drafts/ https://datatracker.ietf.org/public/idindex.cgi

‎ietf/idindex/urls.py‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,17 @@
1313
}
1414

1515
urlpatterns = patterns('',
16-
(r'^wgdocs/(?P<id>\d+)/$', views.wgdocs),
17-
(r'^wgdocs/(?P<slug>[^/]+)/$', views.wgdocs),
18-
(r'^wglist/(?P<wg>[^/]+)/$', views.wglist),
19-
(r'^inddocs/(?P<filter>[^/]+)/$', views.inddocs),
20-
(r'^otherdocs/(?P<cat>[^/]+)/$', views.otherdocs),
21-
(r'^showdocs/(?P<cat>[^/]+)/((?P<sortby>[^/]+)/)?$', views.showdocs),
22-
(r'^(?P<id>\d+)/view_related_docs/$', views.view_related_docs),
23-
(r'^(?P<slug>[^/]+)/view_related_docs/$', views.view_related_docs),
16+
(r'^wg/(?P<id>\d+)/$', views.wgdocs),
17+
(r'^wg/(?P<slug>[^/]+)/$', views.wgdocs),
18+
(r'^ind/(?P<filter>[^/]+)/$', views.inddocs),
19+
(r'^other/(?P<cat>[^/]+)/$', views.otherdocs),
20+
# (?P<cat>(?:all|rfc|current|dead)) really confuses reverse()
21+
(r'^(?P<cat>all)/$', views.showdocs),
22+
(r'^(?P<cat>rfc)/$', views.showdocs),
23+
(r'^(?P<cat>current)/$', views.showdocs),
24+
(r'^(?P<cat>dead)/$', views.showdocs),
25+
(r'^(?P<id>\d+)/related/$', views.view_related_docs),
26+
(r'^(?P<slug>[^/]+)/related/$', views.view_related_docs),
2427
(r'^(?P<object_id>\d+)/$', 'django.views.generic.list_detail.object_detail', info_dict),
2528
(r'^(?P<slug>[^/]+)/$', 'django.views.generic.list_detail.object_detail', dict(info_dict, slug_field='filename')),
2629
(r'^all_id_txt.html$', views.all_id, { 'template_name': 'idindex/all_id_txt.html' }),

‎ietf/idindex/views.py‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,24 @@
1111

1212
base_extra = { 'alphabet': alphabet, 'orgs': orgs }
1313

14-
def wglist(request, wg=None):
15-
if wg == 'other':
16-
queryset = IETFWG.objects.filter(
17-
orl([Q(group_acronym__acronym__istartswith="%d" % i) for i in range(0,10)])
18-
)
19-
else:
20-
queryset = IETFWG.objects.filter(group_acronym__acronym__istartswith=wg)
21-
queryset = queryset.filter(group_type__type='WG').select_related().order_by('status_id', 'acronym.acronym')
22-
return object_list(request, queryset=queryset, template_name='idindex/wglist.html', allow_empty=True, extra_context=base_extra)
23-
2414
def wgdocs(request, **kwargs):
2515
if kwargs.has_key('id'):
2616
queryset = InternetDraft.objects.filter(group=kwargs['id'])
2717
group = Acronym.objects.get(acronym_id=kwargs['id'])
2818
else:
29-
queryset = InternetDraft.objects.filter(group__acronym=kwargs['slug'])
30-
group = Acronym.objects.get(acronym=kwargs['slug'])
19+
wg = kwargs['slug']
20+
try:
21+
group = Acronym.objects.get(acronym=wg)
22+
except Acronym.DoesNotExist: # try a search
23+
if wg == 'other':
24+
queryset = IETFWG.objects.filter(
25+
orl([Q(group_acronym__acronym__istartswith="%d" % i) for i in range(0,10)])
26+
)
27+
else:
28+
queryset = IETFWG.objects.filter(group_acronym__acronym__istartswith=wg)
29+
queryset = queryset.filter(group_type__type='WG').select_related().order_by('status_id', 'acronym.acronym')
30+
return object_list(request, queryset=queryset, template_name='idindex/wglist.html', allow_empty=True, extra_context=base_extra)
31+
queryset = InternetDraft.objects.filter(group__acronym=wg)
3132
queryset = queryset.order_by('status_id', 'filename')
3233
extra = base_extra
3334
extra['group'] = group
@@ -62,7 +63,7 @@ def otherdocs(request, cat=None):
6263
extra['category'] = cat
6364
return object_list(request, queryset=queryset, template_name='idindex/otherdocs.html', allow_empty=True, extra_context=extra)
6465

65-
def showdocs(request, cat=None, sortby=None):
66+
def showdocs(request, cat=None):
6667
catmap = {
6768
'all': { 'extra': { 'header': 'All' } },
6869
'current': { 'extra': { 'header': 'Current', 'norfc': 1 },
@@ -81,7 +82,8 @@ def showdocs(request, cat=None, sortby=None):
8182
'': { 'header': "WHA?",
8283
'fields': ['filename'] },
8384
}
84-
if sortby is None:
85+
sortby = request.GET.get('sort', 'name')
86+
if not(sortmap.has_key(sortby)):
8587
sortby = 'name'
8688
queryset = InternetDraft.objects.all()
8789
if catmap[cat].has_key('query'):

‎ietf/liaisons/testurl.list‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
200 /liaisons/ https://datatracker.ietf.org/public/liaisons.cgi
2-
200 /liaisons/321/ https://datatracker.ietf.org/public/liaison_detail.cgi?detail_id=321
3-
200 /liaisons/managers/ https://datatracker.ietf.org/public/liaison_managers_list.cgi
4-
200 /liaisons/help/to_ietf/ https://datatracker.ietf.org/public/liaison_guide_to_ietf.cgi
5-
200 /liaisons/help/from_ietf/ https://datatracker.ietf.org/public/liaison_guide_from_ietf.cgi
6-
200 /liaisons/help/fields/ https://datatracker.ietf.org/public/liaison_field_help.cgi
7-
200 /liaisons/help/
1+
200 /liaison/ https://datatracker.ietf.org/public/liaisons.cgi
2+
200 /liaison/321/ https://datatracker.ietf.org/public/liaison_detail.cgi?detail_id=321
3+
200 /liaison/managers/ https://datatracker.ietf.org/public/liaison_managers_list.cgi
4+
200 /liaison/help/to_ietf/ https://datatracker.ietf.org/public/liaison_guide_to_ietf.cgi
5+
200 /liaison/help/from_ietf/ https://datatracker.ietf.org/public/liaison_guide_from_ietf.cgi
6+
200 /liaison/help/fields/ https://datatracker.ietf.org/public/liaison_field_help.cgi
7+
200 /liaison/help/

‎ietf/mailinglists/testurl.list‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
200 /mailinglists/area_lists/ https://datatracker.ietf.org/public/area_mailing_list.cgi
2-
200 /mailinglists/nonwg_lists/ https://datatracker.ietf.org/public/nwg_list.cgi
3-
200 /mailinglists/nonwg_lists/submit/ https://datatracker.ietf.org/public/nwg_list_submit.cgi
4-
200 /mailinglists/request/ https://datatracker.ietf.org/public/request_list.cgi
5-
skipredirect,200 /mailinglists/request/help/short_desc/ https://datatracker.ietf.org/public/desc.cgi?id=1
6-
skipredirect,200 /mailinglists/request/help/long_desc/ https://datatracker.ietf.org/public/desc.cgi?id=2
1+
200 /list/area/ https://datatracker.ietf.org/public/area_mailing_list.cgi
2+
200 /list/nonwg/ https://datatracker.ietf.org/public/nwg_list.cgi
3+
200 /list/nonwg/update/ https://datatracker.ietf.org/public/nwg_list_submit.cgi
4+
200 /list/request/ https://datatracker.ietf.org/public/request_list.cgi
5+
skipredirect,200 /list/help/short_desc/ https://datatracker.ietf.org/public/desc.cgi?id=1
6+
skipredirect,200 /list/help/long_desc/ https://datatracker.ietf.org/public/desc.cgi?id=2
77
# This is an ancient testing entry
8-
200 /mailinglists/approve/20A0p492qbq04067/ https://datatracker.ietf.org/public/request_area_confirm.cgi?mailing_list_id=20A0p492qbq04067
8+
200 /list/approve/20A0p492qbq04067/ https://datatracker.ietf.org/public/request_area_confirm.cgi?mailing_list_id=20A0p492qbq04067

‎ietf/mailinglists/urls.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
#from ietf.mailinglists.forms import NonWgStep1
66

77
urlpatterns = patterns('django.views.generic.list_detail',
8-
(r'^area_lists/$', 'object_list', { 'queryset': Area.objects.filter(status=1).select_related().order_by('acronym.acronym'), 'template_name': 'mailinglists/areas_list.html' }),
9-
(r'^nonwg_lists/$', 'object_list', { 'queryset': NonWgMailingList.objects.filter(status__gt=0) }),
8+
(r'^area/$', 'object_list', { 'queryset': Area.objects.filter(status=1).select_related().order_by('acronym.acronym'), 'template_name': 'mailinglists/areas_list.html' }),
9+
(r'^nonwg/$', 'object_list', { 'queryset': NonWgMailingList.objects.filter(status__gt=0) }),
1010
)
1111
urlpatterns += patterns('',
12-
(r'^nonwg_lists/submit/$', views.non_wg_wizard),
12+
(r'^nonwg/update/$', views.non_wg_wizard),
1313
(r'^request/$', views.list_req_wizard),
14-
(r'^request/help/(?P<field>[^/]+)/$', views.list_req_help),
14+
(r'^help/(?P<field>[^/]+)/$', views.list_req_help),
1515
(r'^approve/(?P<object_id>[^/]+)/$', views.list_approve),
1616
)

‎ietf/redirects/fixtures/initial_data.xml‎

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,49 @@
22
<django-objects version="1.0">
33
<object pk="1" model="redirects.redirect">
44
<field type="CharField" name="cgi">public/liaisons.cgi</field>
5-
<field type="CharField" name="url">liaisons</field>
5+
<field type="CharField" name="url">liaison</field>
66
<field type="CharField" name="rest"></field>
77
<field type="CharField" name="remove"></field>
88
</object>
99
<object pk="2" model="redirects.redirect">
1010
<field type="CharField" name="cgi">public/liaison_detail.cgi</field>
11-
<field type="CharField" name="url">liaisons</field>
12-
<field type="CharField" name="rest">%(detail_id)s/</field>
11+
<field type="CharField" name="url">liaison</field>
12+
<field type="CharField" name="rest">%(detail_id)s</field>
1313
<field type="CharField" name="remove"></field>
1414
</object>
1515
<object pk="3" model="redirects.redirect">
1616
<field type="CharField" name="cgi">public/liaison_managers_list.cgi</field>
17-
<field type="CharField" name="url">liaisons/managers</field>
17+
<field type="CharField" name="url">liaison/managers</field>
1818
<field type="CharField" name="rest"></field>
1919
<field type="CharField" name="remove"></field>
2020
</object>
2121
<object pk="4" model="redirects.redirect">
2222
<field type="CharField" name="cgi">public/liaison_guide_to_ietf.cgi</field>
23-
<field type="CharField" name="url">liaisons/help/to_ietf</field>
23+
<field type="CharField" name="url">liaison/help/to_ietf</field>
2424
<field type="CharField" name="rest"></field>
2525
<field type="CharField" name="remove"></field>
2626
</object>
2727
<object pk="5" model="redirects.redirect">
2828
<field type="CharField" name="cgi">public/liaison_guide_from_ietf.cgi</field>
29-
<field type="CharField" name="url">liaisons/help/from_ietf</field>
29+
<field type="CharField" name="url">liaison/help/from_ietf</field>
3030
<field type="CharField" name="rest"></field>
3131
<field type="CharField" name="remove"></field>
3232
</object>
3333
<object pk="6" model="redirects.redirect">
3434
<field type="CharField" name="cgi">public/liaison_field_help.cgi</field>
35-
<field type="CharField" name="url">liaisons/help/fields</field>
35+
<field type="CharField" name="url">liaison/help/fields</field>
3636
<field type="CharField" name="rest"></field>
3737
<field type="CharField" name="remove"></field>
3838
</object>
3939
<object pk="7" model="redirects.redirect">
4040
<field type="CharField" name="cgi">public/idindex.cgi</field>
41-
<field type="CharField" name="url">idindex</field>
41+
<field type="CharField" name="url">drafts</field>
4242
<field type="CharField" name="rest">%(id)s/%(command)s</field>
4343
<field type="CharField" name="remove">id_detail</field>
4444
</object>
4545
<object pk="8" model="redirects.redirect">
4646
<field type="CharField" name="cgi">public/show_nomcom_message.cgi</field>
47-
<field type="CharField" name="url">announcements/nomcom</field>
47+
<field type="CharField" name="url">ann/nomcom</field>
4848
<field type="CharField" name="rest">%(id)s</field>
4949
<field type="CharField" name="remove"></field>
5050
</object>
@@ -140,43 +140,43 @@
140140
</object>
141141
<object pk="24" model="redirects.redirect">
142142
<field type="CharField" name="cgi">public/all_id.cgi</field>
143-
<field type="CharField" name="url">idindex/all_id_txt.html</field>
143+
<field type="CharField" name="url">drafts/all_id_txt.html</field>
144144
<field type="CharField" name="rest"></field>
145145
<field type="CharField" name="remove"></field>
146146
</object>
147147
<object pk="25" model="redirects.redirect">
148148
<field type="CharField" name="cgi">public/all_id_html.cgi</field>
149-
<field type="CharField" name="url">idindex/all_id.html</field>
149+
<field type="CharField" name="url">drafts/all_id.html</field>
150150
<field type="CharField" name="rest"></field>
151151
<field type="CharField" name="remove"></field>
152152
</object>
153153
<object pk="26" model="redirects.redirect">
154154
<field type="CharField" name="cgi">public/area_mailing_list.cgi</field>
155-
<field type="CharField" name="url">mailinglists/area_lists/</field>
155+
<field type="CharField" name="url">list/area</field>
156156
<field type="CharField" name="rest"></field>
157157
<field type="CharField" name="remove"></field>
158158
</object>
159159
<object pk="27" model="redirects.redirect">
160160
<field type="CharField" name="cgi">public/nwg_list.cgi</field>
161-
<field type="CharField" name="url">mailinglists/nonwg_lists</field>
161+
<field type="CharField" name="url">list/nonwg</field>
162162
<field type="CharField" name="rest"></field>
163163
<field type="CharField" name="remove"></field>
164164
</object>
165165
<object pk="28" model="redirects.redirect">
166166
<field type="CharField" name="cgi">public/nwg_list_submit.cgi</field>
167-
<field type="CharField" name="url">mailinglists/nonwg_lists/submit</field>
167+
<field type="CharField" name="url">list/nonwg/update</field>
168168
<field type="CharField" name="rest"></field>
169169
<field type="CharField" name="remove"></field>
170170
</object>
171171
<object pk="29" model="redirects.redirect">
172172
<field type="CharField" name="cgi">public/request_list.cgi</field>
173-
<field type="CharField" name="url">mailinglists/request</field>
173+
<field type="CharField" name="url">list/request</field>
174174
<field type="CharField" name="rest"></field>
175175
<field type="CharField" name="remove"></field>
176176
</object>
177177
<object pk="30" model="redirects.redirect">
178178
<field type="CharField" name="cgi">public/desc.cgi</field>
179-
<field type="CharField" name="url">mailinglists/request/help/</field>
179+
<field type="CharField" name="url">list/help</field>
180180
<field type="CharField" name="rest">%(id)s</field>
181181
<field type="CharField" name="remove"></field>
182182
</object>
@@ -194,7 +194,7 @@
194194
</object>
195195
<object pk="33" model="redirects.redirect">
196196
<field type="CharField" name="cgi">public/request_area_confirm.cgi</field>
197-
<field type="CharField" name="url">mailinglists/approve</field>
197+
<field type="CharField" name="url">list/approve</field>
198198
<field type="CharField" name="rest">%(mailing_list_id)s</field>
199199
<field type="CharField" name="remove"></field>
200200
</object>
@@ -218,21 +218,21 @@
218218
</object>
219219
<object pk="4" model="redirects.command">
220220
<field type="CharField" name="command">show_ind_id</field>
221-
<field type="CharField" name="url">inddocs</field>
221+
<field type="CharField" name="url">ind</field>
222222
<field to="redirects.redirect" name="script" rel="ManyToOneRel">7</field>
223223
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel">2</field>
224224
</object>
225225
<object pk="3" model="redirects.command">
226226
<field type="CharField" name="command">show_wg</field>
227-
<field type="CharField" name="url">wglist</field>
227+
<field type="CharField" name="url">wg</field>
228228
<field to="redirects.redirect" name="script" rel="ManyToOneRel">7</field>
229229
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel">2</field>
230230
</object>
231231
<object pk="5" model="redirects.command">
232232
<field type="CharField" name="command">show_list</field>
233-
<field type="CharField" name="url">showdocs</field>
233+
<field type="CharField" name="url"></field>
234234
<field to="redirects.redirect" name="script" rel="ManyToOneRel">7</field>
235-
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel">3</field>
235+
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel">5</field>
236236
</object>
237237
<object pk="6" model="redirects.command">
238238
<field type="CharField" name="command">view_state_desc</field>
@@ -272,13 +272,13 @@
272272
</object>
273273
<object pk="13" model="redirects.command">
274274
<field type="CharField" name="command">show_wg_id</field>
275-
<field type="CharField" name="url">wgdocs</field>
275+
<field type="CharField" name="url">wg</field>
276276
<field to="redirects.redirect" name="script" rel="ManyToOneRel">7</field>
277277
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel">4</field>
278278
</object>
279279
<object pk="14" model="redirects.command">
280280
<field type="CharField" name="command">show_other</field>
281-
<field type="CharField" name="url">otherdocs</field>
281+
<field type="CharField" name="url">other</field>
282282
<field to="redirects.redirect" name="script" rel="ManyToOneRel">7</field>
283283
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel">5</field>
284284
</object>
@@ -316,10 +316,6 @@
316316
<field type="CharField" name="rest">%(fl)s</field>
317317
<field type="CharField" name="remove"></field>
318318
</object>
319-
<object pk="3" model="redirects.suffix">
320-
<field type="CharField" name="rest">%(cat)s/%(sort)s</field>
321-
<field type="CharField" name="remove"></field>
322-
</object>
323319
<object pk="4" model="redirects.suffix">
324320
<field type="CharField" name="rest">%(id)s</field>
325321
<field type="CharField" name="remove"></field>

0 commit comments

Comments
 (0)