Skip to content

Commit d9ccff1

Browse files
committed
Get rid of the view behind /iesg/ann/0-9+/ (apparently for displaying
ballot text for drafts processed by the IESG) - it has not worked since the switch to the new schema as it's based on the old numeric primary keys which we no longer have - Legacy-Id: 6313
1 parent 5c6ee01 commit d9ccff1

2 files changed

Lines changed: 18 additions & 61 deletions

File tree

ietf/iesg/urls.py

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -35,36 +35,26 @@
3535
from django.conf.urls.defaults import patterns, url
3636
from django.conf import settings
3737
from ietf.iesg import views
38-
from ietf.idtracker.models import BallotInfo
39-
40-
queryset_ann = BallotInfo.objects.all()
4138

4239
urlpatterns = patterns('',
43-
(r'^telechat/.*$', 'django.views.generic.simple.redirect_to', { 'url': 'http://www.ietf.org/iesg/minutes.html' })
44-
)
45-
46-
urlpatterns += patterns('django.views.generic.list_detail',
47-
(r'^ann/(?P<object_id>\d+)/$', 'object_detail', { 'queryset': queryset_ann, 'template_name':"iesg/ballotinfo_detail.html" }),
48-
)
49-
50-
urlpatterns += patterns('',
51-
(r'^ann/ind/$',views.inddocs),
52-
(r'^ann/(?P<cat>[^/]+)/$',views.wgdocs),
53-
(r'^agenda/$', views.agenda),
54-
(r'^agenda/agenda.txt$', views.agenda_txt),
55-
(r'^agenda/agenda.json$', views.agenda_json),
56-
(r'^agenda/scribe_template.html$', views.agenda_scribe_template),
57-
(r'^agenda/moderator_package.html$', views.agenda_moderator_package),
58-
(r'^agenda/agenda_package.txt$', views.agenda_package),
59-
(r'^agenda/documents.txt$', views.agenda_documents_txt),
60-
(r'^agenda/documents/$', views.agenda_documents),
61-
(r'^agenda/telechat-(?P<year>\d+)-(?P<month>\d+)-(?P<day>\d+)-docs.tgz', views.telechat_docs_tarfile),
62-
(r'^discusses/$', views.discusses),
63-
(r'^milestones', views.milestones_needing_review),
64-
(r'^telechatdates/$', 'django.views.generic.simple.redirect_to', { 'url': '/admin/iesg/telechatdate/' }),
65-
url(r'^wgactions/$', views.working_group_actions, name="iesg_working_group_actions"),
66-
url(r'^wgactions/add/$', views.edit_working_group_action, { 'wga_id': None }, name="iesg_add_working_group_action"),
67-
url(r'^wgactions/(?P<wga_id>\d+)/$', views.edit_working_group_action, name="iesg_edit_working_group_action"),
40+
(r'^telechat/.*$', 'django.views.generic.simple.redirect_to', { 'url': 'http://www.ietf.org/iesg/minutes.html' })
41+
(r'^ann/ind/$',views.inddocs),
42+
(r'^ann/(?P<cat>[^/]+)/$',views.wgdocs),
43+
(r'^agenda/$', views.agenda),
44+
(r'^agenda/agenda.txt$', views.agenda_txt),
45+
(r'^agenda/agenda.json$', views.agenda_json),
46+
(r'^agenda/scribe_template.html$', views.agenda_scribe_template),
47+
(r'^agenda/moderator_package.html$', views.agenda_moderator_package),
48+
(r'^agenda/agenda_package.txt$', views.agenda_package),
49+
(r'^agenda/documents.txt$', views.agenda_documents_txt),
50+
(r'^agenda/documents/$', views.agenda_documents),
51+
(r'^agenda/telechat-(?P<year>\d+)-(?P<month>\d+)-(?P<day>\d+)-docs.tgz', views.telechat_docs_tarfile),
52+
(r'^discusses/$', views.discusses),
53+
(r'^milestones', views.milestones_needing_review),
54+
(r'^telechatdates/$', 'django.views.generic.simple.redirect_to', { 'url': '/admin/iesg/telechatdate/' }),
55+
url(r'^wgactions/$', views.working_group_actions, name="iesg_working_group_actions"),
56+
url(r'^wgactions/add/$', views.edit_working_group_action, { 'wga_id': None }, name="iesg_add_working_group_action"),
57+
url(r'^wgactions/(?P<wga_id>\d+)/$', views.edit_working_group_action, name="iesg_edit_working_group_action"),
6858
)
6959

7060
if settings.SERVER_MODE != 'production':

ietf/templates/iesg/ballotinfo_detail.html

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)