Changes due to adamlaska#168:

 * Move wg number redirect to /drafts/wgid/___/
 * Redirect from /drafts/wgid/___/ to /drafts/wg/wgname/

While testing and reading code, I decided to fix:
 * Copy base_extra when assigning it, since this was what was initially intended
 * Pass the search string to the wglist template to give a nice error message if there are no matching working groups.
 - Legacy-Id: 747

Author: fenner

ietf/idindex/urls.py

@@ -15,8 +15,8 @@
 }
 
 urlpatterns = patterns('',
-     (r'^wg/(?P<id>\d+)/$', views.wgdocs),
-     (r'^wg/(?P<slug>[^/]+)/$', views.wgdocs),
+     (r'^wgid/(?P<id>\d+)/$', views.wgdocs_redir),
+     (r'^wg/(?P<wg>[^/]+)/$', views.wgdocs),
      (r'^ind/(?P<filter>[^/]+)/$', views.inddocs),
      (r'^other/(?P<cat>[^/]+)/$', views.otherdocs),
      # (?P<cat>(?:all|rfc|current|dead)) really confuses reverse()

ietf/idindex/views.py

@@ -1,38 +1,40 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-from django.http import HttpResponse
+from django.http import HttpResponse, HttpResponsePermanentRedirect
 from django.views.generic.list_detail import object_list
 from django.db.models import Q
 from django.http import Http404
 from django.template import RequestContext, loader
 from django.shortcuts import render_to_response, get_object_or_404
+from django.core.urlresolvers import reverse
 from ietf.idtracker.models import Acronym, IETFWG, InternetDraft, Rfc
 from ietf.idindex.forms import IDIndexSearchForm
 from ietf.idindex.models import alphabet, orgs, orgs_dict
 from ietf.utils import orl, flattenl
 
 base_extra = { 'alphabet': alphabet, 'orgs': orgs }
 
-def wgdocs(request, **kwargs):
-    if kwargs.has_key('id'):
-	queryset = InternetDraft.objects.filter(group=kwargs['id'])
-	group = get_object_or_404(Acronym, acronym_id=kwargs['id'])
-    else:
-	wg = kwargs['slug']
-	try:
-	    group = Acronym.objects.get(acronym=wg)
-	except Acronym.DoesNotExist:	# try a search
-	    if wg == 'other':
-		queryset = IETFWG.objects.filter(
-		    orl([Q(group_acronym__acronym__istartswith="%d" % i) for i in range(0,10)])
-		    )
-	    else:
-		queryset = IETFWG.objects.filter(group_acronym__acronym__istartswith=wg)
-	    queryset = queryset.filter(group_type__type='WG').select_related().order_by('status_id', 'acronym.acronym')
-	    return object_list(request, queryset=queryset, template_name='idindex/wglist.html', allow_empty=True, extra_context=base_extra)
-        queryset = InternetDraft.objects.filter(group__acronym=wg)
+def wgdocs_redir(request, id):
+    group = get_object_or_404(Acronym, acronym_id=id)
+    return HttpResponsePermanentRedirect(reverse(wgdocs, args=[group.acronym]))
+
+def wgdocs(request, wg):
+    try:
+	group = Acronym.objects.get(acronym=wg)
+    except Acronym.DoesNotExist:	# try a search
+	if wg == 'other':
+	    queryset = IETFWG.objects.filter(
+		orl([Q(group_acronym__acronym__istartswith="%d" % i) for i in range(0,10)])
+		)
+	else:
+	    queryset = IETFWG.objects.filter(group_acronym__acronym__istartswith=wg)
+	queryset = queryset.filter(group_type__type='WG').select_related().order_by('status_id', 'acronym.acronym')
+	extra = base_extra.copy()
+	extra['search'] = wg
+	return object_list(request, queryset=queryset, template_name='idindex/wglist.html', allow_empty=True, extra_context=extra)
+    queryset = InternetDraft.objects.filter(group__acronym=wg)
     queryset = queryset.order_by('status_id', 'filename')
-    extra = base_extra
+    extra = base_extra.copy()
     extra['group'] = group
     return object_list(request, queryset=queryset, template_name='idindex/wgdocs.html', allow_empty=True, extra_context=extra)
 
@@ -47,7 +49,7 @@ def inddocs(request, filter=None):
     else:
 	queryset = InternetDraft.objects.filter(filename__istartswith='draft-' + filter)
     queryset = queryset.exclude(ind_exception).filter(group__acronym='none').order_by('filename')
-    extra = base_extra
+    extra = base_extra.copy()
     extra['filter'] = filter
     return object_list(request, queryset=queryset, template_name='idindex/inddocs.html', allow_empty=True, extra_context=extra)
 
@@ -61,7 +63,7 @@ def otherdocs(request, cat=None):
 	     Q(filename__istartswith="draft-ietf-%s-" % p)
 		for p in org.get('prefixes', [ org['key'] ])]))
     queryset = queryset.order_by('status_id','filename')
-    extra = base_extra
+    extra = base_extra.copy()
     extra['category'] = cat
     return object_list(request, queryset=queryset, template_name='idindex/otherdocs.html', allow_empty=True, extra_context=extra)
 

ietf/redirects/fixtures/initial_data.xml

@@ -272,7 +272,7 @@
   </object>
   <object pk="13" model="redirects.command">
     <field type="CharField" name="command">show_wg_id</field>
-    <field type="CharField" name="url">wg</field>
+    <field type="CharField" name="url">wgid</field>
     <field to="redirects.redirect" name="script" rel="ManyToOneRel">7</field>
     <field to="redirects.suffix" name="suffix" rel="ManyToOneRel">4</field>
   </object>

ietf/templates/idindex/wglist.html

@@ -4,6 +4,7 @@
 {% block iddbcontent %}
 <hr>
 <h3>Please select a Working Group from the list below</h3>
+{% if object_list %}
 <blockquote>
 {% regroup object_list by status as grouped %}
 {% for status in grouped %}
@@ -19,5 +20,8 @@ <h4>{{ status.grouper }} Working Groups</h4>
 {% endfor %}
 </ul>
 {% endfor %}
+{% else %}
+<p>No working groups found beginning with "{{ search }}".</p>
+{% endif %}
 
 {% endblock %}