Skip to content

Commit ff9b8a9

Browse files
levkowetzlevkowetz
committed
Deprecation fixes: Explicitly say that redirects are permanent.
 - Legacy-Id: 12532
1 parent cc333d9 commit ff9b8a9

9 files changed

Lines changed: 33 additions & 33 deletions

File tree

‎ietf/doc/redirect_drafts_urls.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
from ietf.group.models import Group
99

1010
urlpatterns = patterns('',
11-
(r'^$', RedirectView.as_view(url='/doc/')),
12-
(r'^all/$', RedirectView.as_view(url='/doc/all/')),
13-
(r'^rfc/$', RedirectView.as_view(url='/doc/all/#rfc')),
14-
(r'^dead/$', RedirectView.as_view(url='/doc/all/#expired')),
15-
(r'^current/$', RedirectView.as_view(url='/doc/active/')),
16-
(r'^(?P<object_id>\d+)/(related/)?$', RedirectView.as_view(url='/doc/')),
17-
(r'^(?P<name>[^/]+)/(related/)?$', RedirectView.as_view(url='/doc/%(name)s/')),
11+
(r'^$', RedirectView.as_view(url='/doc/', permanent=True)),
12+
(r'^all/$', RedirectView.as_view(url='/doc/all/', permanent=True)),
13+
(r'^rfc/$', RedirectView.as_view(url='/doc/all/#rfc', permanent=True)),
14+
(r'^dead/$', RedirectView.as_view(url='/doc/all/#expired', permanent=True)),
15+
(r'^current/$', RedirectView.as_view(url='/doc/active/', permanent=True)),
16+
(r'^(?P<object_id>\d+)/(related/)?$', RedirectView.as_view(url='/doc/', permanent=True)),
17+
(r'^(?P<name>[^/]+)/(related/)?$', RedirectView.as_view(url='/doc/%(name)s/', permanent=True)),
1818
(r'^wgid/(?P<id>\d+)/$', lambda request, id: HttpResponsePermanentRedirect("/wg/%s/" % get_object_or_404(Group, id=id).acronym)),
19-
(r'^wg/(?P<acronym>[^/]+)/$', RedirectView.as_view(url='/wg/%(acronym)s/')),
20-
(r'^all_id(?:_txt)?.html$', RedirectView.as_view(url='https://www.ietf.org/id/all_id.txt')),
19+
(r'^wg/(?P<acronym>[^/]+)/$', RedirectView.as_view(url='/wg/%(acronym)s/', permanent=True)),
20+
(r'^all_id(?:_txt)?.html$', RedirectView.as_view(url='https://www.ietf.org/id/all_id.txt', permanent=True)),
2121
)

‎ietf/doc/redirect_idtracker_urls.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
from django.views.generic import RedirectView
33

44
urlpatterns = patterns('',
5-
(r'^help/(?:sub)?state/(?:\d+/)?$', RedirectView.as_view(url='/doc/help/state/draft-iesg/')),
6-
(r'^help/evaluation/$', RedirectView.as_view(url='https://www.ietf.org/iesg/voting-procedures.html')),
7-
(r'^status/$', RedirectView.as_view(url='/doc/iesg/')),
8-
(r'^status/last-call/$', RedirectView.as_view(url='/doc/iesg/last-call/')),
9-
(r'^rfc0*(?P<rfc_number>\d+)/$', RedirectView.as_view(url='/doc/rfc%(rfc_number)s/')),
10-
(r'^(?P<name>[^/]+)/$', RedirectView.as_view(url='/doc/%(name)s/')),
11-
(r'^(?P<name>[^/]+)/comment/\d+/$', RedirectView.as_view(url='/doc/%(name)s/history/')),
12-
(r'^$', RedirectView.as_view(url='/doc/')),
5+
(r'^help/(?:sub)?state/(?:\d+/)?$', RedirectView.as_view(url='/doc/help/state/draft-iesg/', permanent=True)),
6+
(r'^help/evaluation/$', RedirectView.as_view(url='https://www.ietf.org/iesg/voting-procedures.html', permanent=True)),
7+
(r'^status/$', RedirectView.as_view(url='/doc/iesg/', permanent=True)),
8+
(r'^status/last-call/$', RedirectView.as_view(url='/doc/iesg/last-call/', permanent=True)),
9+
(r'^rfc0*(?P<rfc_number>\d+)/$', RedirectView.as_view(url='/doc/rfc%(rfc_number)s/', permanent=True)),
10+
(r'^(?P<name>[^/]+)/$', RedirectView.as_view(url='/doc/%(name)s/', permanent=True)),
11+
(r'^(?P<name>[^/]+)/comment/\d+/$', RedirectView.as_view(url='/doc/%(name)s/history/', permanent=True)),
12+
(r'^$', RedirectView.as_view(url='/doc/', permanent=True)),
1313
)

‎ietf/feed_urls.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
urlpatterns = patterns(
1313
'',
14-
(r'^comments/(?P<remainder>.*)/$', RedirectView.as_view(url='/feed/document-changes/%(remainder)s/')),
14+
(r'^comments/(?P<remainder>.*)/$', RedirectView.as_view(url='/feed/document-changes/%(remainder)s/', permanent=True)),
1515
(r'^document-changes/%(name)s/$' % settings.URL_REGEXPS, DocumentChangesFeed()),
1616
(r'^last-call/$', InLastCallFeed()),
1717
(r'^group-changes/%(acronym)s/$' % settings.URL_REGEXPS, GroupChangesFeed()),

‎ietf/group/urls_info.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88

99
urlpatterns = patterns('',
1010
(r'^$', views.active_groups),
11-
(r'^summary.txt', RedirectView.as_view(url='/wg/1wg-summary.txt')),
12-
(r'^summary-by-area.txt', RedirectView.as_view(url='/wg/1wg-summary.txt')),
13-
(r'^summary-by-acronym.txt', RedirectView.as_view(url='/wg/1wg-summary-by-acronym.txt')),
11+
(r'^summary.txt', RedirectView.as_view(url='/wg/1wg-summary.txt', permanent=True)),
12+
(r'^summary-by-area.txt', RedirectView.as_view(url='/wg/1wg-summary.txt', permanent=True)),
13+
(r'^summary-by-acronym.txt', RedirectView.as_view(url='/wg/1wg-summary-by-acronym.txt', permanent=True)),
1414
(r'^1wg-summary.txt', views.wg_summary_area),
1515
(r'^1wg-summary-by-acronym.txt', views.wg_summary_acronym),
1616
(r'^1wg-charters.txt', views.wg_charters),
1717
(r'^1wg-charters-by-acronym.txt', views.wg_charters_by_acronym),
18-
(r'^chartering/$', RedirectView.as_view(url='/group/chartering/')),
19-
(r'^chartering/create/$', RedirectView.as_view(url='/group/chartering/create/%(group_type)s/')),
18+
(r'^chartering/$', RedirectView.as_view(url='/group/chartering/', permanent=True)),
19+
(r'^chartering/create/$', RedirectView.as_view(url='/group/chartering/create/%(group_type)s/', permanent=True)),
2020
(r'^bofs/$', views.bofs),
2121
(r'^email-aliases/$', 'ietf.group.views.email_aliases'),
2222
(r'^bofs/create/$', views_edit.edit, {'action': "create", }, "bof_create"),

‎ietf/iesg/urls.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
from django.conf import settings
3838

3939
urlpatterns = patterns('',
40-
(r'^telechat/.*$', RedirectView.as_view(url='https://www.ietf.org/iesg/minutes.html')),
41-
(r'^ann/(?:ind|new|prev)/$', RedirectView.as_view(url="/iesg/decisions/", permanent=True )),
42-
(r'^telechatdates/$', RedirectView.as_view(url='/admin/iesg/telechatdate/')),
40+
(r'^telechat/.*$', RedirectView.as_view(url='https://www.ietf.org/iesg/minutes.html', permanent=True)),
41+
(r'^ann/(?:ind|new|prev)/$', RedirectView.as_view(url="/iesg/decisions/", permanent=True)),
42+
(r'^telechatdates/$', RedirectView.as_view(url='/admin/iesg/telechatdate/', permanent=True)),
4343

4444
(r'^decisions/(?:(?P<year>[0-9]{4})/)?$', "ietf.iesg.views.review_decisions"),
4545
(r'^agenda/(?:%(date)s/)?$' % settings.URL_REGEXPS, "ietf.iesg.views.agenda"),

‎ietf/ipr/urls.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
urlpatterns = patterns('ietf.ipr.views',
88
url(r'^$', 'showlist', name='ipr_showlist'),
99
(r'^about/$', 'about'),
10-
url(r'^admin/$', RedirectView.as_view(url=reverse_lazy('ipr_admin',kwargs={'state':'pending'})),name="ipr_admin_main"),
10+
url(r'^admin/$', RedirectView.as_view(url=reverse_lazy('ipr_admin',kwargs={'state':'pending'}), permanent=True),name="ipr_admin_main"),
1111
url(r'^admin/(?P<state>pending|removed|parked)/$', 'admin', name='ipr_admin'),
1212
url(r'^ajax/search/$', 'ajax_search', name='ipr_ajax_search'),
1313
url(r'^by-draft/$', 'by_draft_txt'),
@@ -21,7 +21,7 @@
2121
url(r'^(?P<id>\d+)/notify/(?P<type>update|posted)/$', 'notify', name='ipr_notify'),
2222
url(r'^(?P<id>\d+)/post/$', 'post', name='ipr_post'),
2323
url(r'^(?P<id>\d+)/state/$', 'state', name='ipr_state'),
24-
(r'^update/$', RedirectView.as_view(url=reverse_lazy('ipr_showlist'))),
24+
(r'^update/$', RedirectView.as_view(url=reverse_lazy('ipr_showlist'), permanent=True)),
2525
url(r'^update/(?P<id>\d+)/$', 'update', name='ipr_update'),
2626
url(r'^new-(?P<type>(specific|generic|third-party))/$', 'new', name='ipr_new'),
2727
url(r'^search/$', 'search', name="ipr_search"),

‎ietf/liaisons/urls.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
url(r'^help/fields/$', TemplateView.as_view(template_name='liaisons/field_help.html'), name='liaisons_field_help'),
99
(r'^help/from_ietf/$', TemplateView.as_view(template_name='liaisons/guide_from_ietf.html')),
1010
(r'^help/to_ietf/$', TemplateView.as_view(template_name='liaisons/guide_to_ietf.html')),
11-
(r'^managers/$', RedirectView.as_view(url='https://www.ietf.org/liaison/managers.html')),
11+
(r'^managers/$', RedirectView.as_view(url='https://www.ietf.org/liaison/managers.html', permanent=True)),
1212
)
1313

1414
# AJAX views

‎ietf/mailinglists/urls.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
urlpatterns = patterns('',
77
(r'^wg/$', 'ietf.mailinglists.views.groups'),
8-
(r'^nonwg/$', RedirectView.as_view(url='https://www.ietf.org/list/nonwg.html')),
9-
(r'^nonwg/update/$', RedirectView.as_view(url='https://www.ietf.org/list/nonwg.html')),
10-
(r'^request/$', RedirectView.as_view(url='https://www.ietf.org/list/request.html')),
8+
(r'^nonwg/$', RedirectView.as_view(url='https://www.ietf.org/list/nonwg.html', permanent=True)),
9+
(r'^nonwg/update/$', RedirectView.as_view(url='https://www.ietf.org/list/nonwg.html', permanent=True)),
10+
(r'^request/$', RedirectView.as_view(url='https://www.ietf.org/list/request.html', permanent=True)),
1111
)

‎ietf/secr/proceedings/urls.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
url(r'^(?P<meeting_num>\d{1,3})/recording/$', 'recording', name='proceedings_recording'),
1313
url(r'^(?P<meeting_num>\d{1,3})/recording/edit/(?P<name>[A-Za-z0-9_\-\+]+)$', 'recording_edit', name='proceedings_recording_edit'),
1414
url(r'^(?P<num>\d{1,3}|interim-\d{4}-[A-Za-z0-9_\-\+]+)/%(acronym)s/$' % settings.URL_REGEXPS,
15-
OldUploadRedirect.as_view()),
15+
OldUploadRedirect.as_view(permanent=True)),
1616
)

0 commit comments

Comments
 (0)