Removed /drafts/other/X/
- Legacy-Id: 2008
This commit is contained in:
parent
25845dd6b2
commit
0cd1d1d0c0
|
@ -1,7 +1,6 @@
|
|||
301 /drafts/wgid/1041/
|
||||
200 /drafts/wg/idr/
|
||||
200 /drafts/wg/I/
|
||||
200 /drafts/other/tools/
|
||||
301 /drafts/rfc/
|
||||
301 /drafts/current/
|
||||
301 /drafts/all/
|
||||
|
|
|
@ -18,7 +18,6 @@ info_dict = {
|
|||
urlpatterns = patterns('',
|
||||
(r'^wgid/(?P<id>\d+)/$', views.wgdocs_redir),
|
||||
(r'^wg/(?P<wg>[^/]+)/$', views.wgdocs),
|
||||
(r'^other/(?P<cat>[^/]+)/$', views.otherdocs),
|
||||
(r'^all/$', 'django.views.generic.simple.redirect_to', { 'url': '/doc/all/'}),
|
||||
(r'^rfc/$', 'django.views.generic.simple.redirect_to', { 'url': '/doc/all/#rfc'}),
|
||||
(r'^dead/$', 'django.views.generic.simple.redirect_to', { 'url': '/doc/all/#dead'}),
|
||||
|
|
|
@ -45,7 +45,7 @@ from ietf.idindex.forms import IDIndexSearchForm
|
|||
from ietf.idindex.models import alphabet, orgs, orgs_dict
|
||||
from ietf.utils import orl, flattenl, normalize_draftname
|
||||
|
||||
base_extra = { 'alphabet': alphabet, 'orgs': orgs }
|
||||
base_extra = { 'alphabet': alphabet }
|
||||
|
||||
def wgdocs_redir(request, id):
|
||||
group = get_object_or_404(Acronym, acronym_id=id)
|
||||
|
@ -71,21 +71,6 @@ def wgdocs(request, wg):
|
|||
extra['group'] = group
|
||||
return object_list(request, queryset=queryset, template_name='idindex/wgdocs.html', allow_empty=True, extra_context=extra)
|
||||
|
||||
def otherdocs(request, cat=None):
|
||||
try:
|
||||
org = orgs_dict[cat]
|
||||
except KeyError:
|
||||
raise Http404
|
||||
queryset = InternetDraft.objects.filter(
|
||||
orl([Q(filename__istartswith="draft-%s-" % p)|
|
||||
Q(filename__istartswith="draft-ietf-%s-" % p)
|
||||
for p in org.get('prefixes', [ org['key'] ])]))
|
||||
queryset = queryset.order_by('status','filename')
|
||||
extra = base_extra.copy()
|
||||
extra['category'] = cat
|
||||
return object_list(request, queryset=queryset, template_name='idindex/otherdocs.html', allow_empty=True, extra_context=extra)
|
||||
|
||||
|
||||
def search(request):
|
||||
args = request.GET.copy()
|
||||
if args.has_key('filename'):
|
||||
|
|
|
@ -14,11 +14,6 @@ IETF Working Group Drafts
|
|||
{% endfor %}
|
||||
<a href="{% url ietf.idindex.views.wgdocs "other" %}">other</a><br>
|
||||
|
||||
Other Drafts
|
||||
{% for org in orgs %}
|
||||
<a href="{% url ietf.idindex.views.otherdocs org.key %}">{{ org.name.upper }}</a>
|
||||
{% endfor %}
|
||||
<br>
|
||||
<a href="{% url ietf.idindex.views.search %}">I-D Search</a>
|
||||
{% endblock %}
|
||||
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
{# Copyright The IETF Trust 2007, All Rights Reserved #}
|
||||
{% extends "idindex/base.html" %}
|
||||
|
||||
{% block iddbcontent %}
|
||||
<hr>
|
||||
<h2>I-Ds List, Other Drafts - <i>{{ category.upper }}</i></h2>
|
||||
{% include "idindex/doclist.html" %}
|
||||
{% endblock %}
|
Loading…
Reference in a new issue