altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Get rid of the view behind /iesg/ann/0-9+/ (apparently for displaying

Browse source 
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
This commit is contained in:
Ole Laursen 2013-09-30 12:49:08 +00:00
parent 5c6ee01bf7
commit d9ccff1889
2 changed files with 18 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
ietf/iesg/urls.py
View file

@ -35,36 +35,26 @@
from django.conf.urls.defaults import patterns, url
from django.conf import settings
from ietf.iesg import views
from ietf.idtracker.models import BallotInfo
queryset_ann = BallotInfo.objects.all()
urlpatterns = patterns('',
(r'^telechat/.*$', 'django.views.generic.simple.redirect_to', { 'url': 'http://www.ietf.org/iesg/minutes.html' })
)
urlpatterns += patterns('django.views.generic.list_detail',
(r'^ann/(?P<object_id>\d+)/$', 'object_detail', { 'queryset': queryset_ann, 'template_name':"iesg/ballotinfo_detail.html" }),
)
urlpatterns += patterns('',
(r'^ann/ind/$',views.inddocs),
(r'^ann/(?P<cat>[^/]+)/$',views.wgdocs),
(r'^agenda/$', views.agenda),
(r'^agenda/agenda.txt$', views.agenda_txt),
(r'^agenda/agenda.json$', views.agenda_json),
(r'^agenda/scribe_template.html$', views.agenda_scribe_template),
(r'^agenda/moderator_package.html$', views.agenda_moderator_package),
(r'^agenda/agenda_package.txt$', views.agenda_package),
(r'^agenda/documents.txt$', views.agenda_documents_txt),
(r'^agenda/documents/$', views.agenda_documents),
(r'^agenda/telechat-(?P<year>\d+)-(?P<month>\d+)-(?P<day>\d+)-docs.tgz', views.telechat_docs_tarfile),
(r'^discusses/$', views.discusses),
(r'^milestones', views.milestones_needing_review),
(r'^telechatdates/$', 'django.views.generic.simple.redirect_to', { 'url': '/admin/iesg/telechatdate/' }),
url(r'^wgactions/$', views.working_group_actions, name="iesg_working_group_actions"),
url(r'^wgactions/add/$', views.edit_working_group_action, { 'wga_id': None }, name="iesg_add_working_group_action"),
url(r'^wgactions/(?P<wga_id>\d+)/$', views.edit_working_group_action, name="iesg_edit_working_group_action"),
(r'^telechat/.*$', 'django.views.generic.simple.redirect_to', { 'url': 'http://www.ietf.org/iesg/minutes.html' })
(r'^ann/ind/$',views.inddocs),
(r'^ann/(?P<cat>[^/]+)/$',views.wgdocs),
(r'^agenda/$', views.agenda),
(r'^agenda/agenda.txt$', views.agenda_txt),
(r'^agenda/agenda.json$', views.agenda_json),
(r'^agenda/scribe_template.html$', views.agenda_scribe_template),
(r'^agenda/moderator_package.html$', views.agenda_moderator_package),
(r'^agenda/agenda_package.txt$', views.agenda_package),
(r'^agenda/documents.txt$', views.agenda_documents_txt),
(r'^agenda/documents/$', views.agenda_documents),
(r'^agenda/telechat-(?P<year>\d+)-(?P<month>\d+)-(?P<day>\d+)-docs.tgz', views.telechat_docs_tarfile),
(r'^discusses/$', views.discusses),
(r'^milestones', views.milestones_needing_review),
(r'^telechatdates/$', 'django.views.generic.simple.redirect_to', { 'url': '/admin/iesg/telechatdate/' }),
url(r'^wgactions/$', views.working_group_actions, name="iesg_working_group_actions"),
url(r'^wgactions/add/$', views.edit_working_group_action, { 'wga_id': None }, name="iesg_add_working_group_action"),
url(r'^wgactions/(?P<wga_id>\d+)/$', views.edit_working_group_action, name="iesg_edit_working_group_action"),
)
if settings.SERVER_MODE != 'production':

33
ietf/templates/iesg/ballotinfo_detail.html
View file

@ -1,33 +0,0 @@
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% extends "base.html" %}
{% block title %}IESG Announcement{% endblock %}
{% block content %}
<h1>IESG Announcement</h1>
<blockquote>
<p>
This page contains an IESG Protocol, Document, or Working Group Action
announcement. Other announcements can be found using the links below.
</p>
<b>
<ol>
<li><a href="#protocol">Protocol Action Announcements</a></li>
<li><a href="#document">Document Action Announcements</a></li>
<li><a href="#wg">Working Group Action Announcements</a></li>
<li><a href="/iesg/ann/new/">Recent IESG Announcements</a></li>
<li><a href="/iesg/ann/prev/">Previous IESG Announcements</a></li>
</ol>
</b>
</blockquote>
<hr>
<pre>
{{ object.approval_text|escape|urlize }}
{{ object.ballot_writeup|escape|urlize }}
</pre>
<form>
<input type="button" onClick="history.go(-1);return true;" value="Back to List">
</form>
{% endblock %}