Skip to content

Commit e3c6e0a

Browse files
committed
Changed the state shown in all_id.txt for drafts which have entered IESG processing, but then been replaced, to show as 'Replaced' instead of 'In IESG Processing'. This is consistent with how they are shown in all_id2.txt.
- Legacy-Id: 12527
1 parent 3c812b0 commit e3c6e0a

31 files changed

Lines changed: 69 additions & 63 deletions

ietf/api/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ def autodiscover():
133133
may want.
134134
"""
135135

136+
from importlib import import_module
136137
from django.conf import settings
137-
from django.utils.importlib import import_module
138138
from django.utils.module_loading import module_has_submodule
139139

140140
for app in settings.INSTALLED_APPS:

ietf/api/tests.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
import sys
33
import json
44

5+
from django.apps import apps
56
from django.test import Client
67
from django.conf import settings
78
from django.utils.importlib import import_module
8-
from django.db import models
99

1010
from tastypie.exceptions import BadRequest
1111
from tastypie.test import ResourceTestCaseMixin
@@ -82,7 +82,8 @@ def test_all_model_resources_exist(self):
8282
self.assertValidJSONResponse(r)
8383
app_resources = json.loads(r.content)
8484
self._assertCallbackReturnsSameJSON("/api/v1/%s/"%name, app_resources)
85-
model_list = models.get_models(app.models)
85+
model_list = apps.get_models(app.models)
86+
8687
for model in model_list:
8788
if not model._meta.model_name in app_resources.keys():
8889
#print("There doesn't seem to be any resource for model %s.models.%s"%(app.__name__,model.__name__,))

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/doc/views_ballot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ def approve_ballot(request, name):
769769
if ballot_writeup_event.pk == None:
770770
ballot_writeup_event.save()
771771

772-
if new_state.slug == "ann" and new_state.slug != prev_state.slug and not request.REQUEST.get("skiprfceditorpost"):
772+
if new_state.slug == "ann" and new_state.slug != prev_state.slug and not request.POST.get("skiprfceditorpost"):
773773
# start by notifying the RFC Editor
774774
import ietf.sync.rfceditor
775775
response, error = ietf.sync.rfceditor.post_approved_draft(settings.RFC_EDITOR_SYNC_NOTIFICATION_URL, doc.name)

ietf/doc/views_draft.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1152,7 +1152,7 @@ def request_publication(request, name):
11521152
if form.is_valid():
11531153
events = []
11541154

1155-
if not request.REQUEST.get("skiprfceditorpost"):
1155+
if not request.POST.get("skiprfceditorpost"):
11561156
# start by notifying the RFC Editor
11571157
import ietf.sync.rfceditor
11581158
response, error = ietf.sync.rfceditor.post_approved_draft(settings.RFC_EDITOR_SYNC_NOTIFICATION_URL, doc.name)

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/idindex/index.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def add_line(f1, f2, f3, f4):
4444

4545
inactive_states = ["pub", "watching", "dead"]
4646

47-
in_iesg_process = all_ids.exclude(states=State.objects.get(type="draft", slug="rfc")).filter(states__in=list(State.objects.filter(type="draft-iesg").exclude(slug__in=inactive_states))).only("name", "rev")
47+
in_iesg_process = all_ids.exclude(states=State.objects.filter(type="draft", slug__in=["rfc","repl"])).filter(states__in=list(State.objects.filter(type="draft-iesg").exclude(slug__in=inactive_states))).only("name", "rev")
4848

4949
# handle those actively in the IESG process
5050
for d in in_iesg_process:

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

0 commit comments

Comments
 (0)