Changeset 6a646ce

Timestamp:

Aug 25, 2011, 1:02:00 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage, test-hooks

Children:

9b4e15e

Parents:

9ea4909

git-author:

Alex Dehnert <adehnert@…> (08/25/11 01:02:00)

git-committer:

Alex Dehnert <adehnert@…> (08/25/11 01:02:00)

Message:

Add general group search page

This just lets you choose between group info and signatories, and redirects
you after you input your query.

Location:

asadb

Files:

• groups/views.py (modified) (2 diffs)
• template/groups/group_search.html (added)
• template/index.html (modified) (1 diff)
• urls.py (modified) (1 diff)

asadb/groups/views.py

@@ -10 +10 @@
 from django.core.exceptions import PermissionDenied
 from django.views.generic import ListView, DetailView
-from django.shortcuts import render_to_response, get_object_or_404
+from django.shortcuts import render_to_response, get_object_or_404, redirect
 from django.template import RequestContext
 from django.template import Context, Template
@@ -418 +418 @@
     }
     return render_to_response('groups/groups_signatories.html', context, context_instance=RequestContext(request), )
+
+def search_groups(request, ):
+    the_groups = groups.models.Group.objects.all()
+    groups_filterset = GroupFilter(request.GET, the_groups)
+
+    dest = None
+    if 'signatories' in request.GET:
+        dest = reverse('groups-signatories')
+        print dest
+    elif 'group-info' in request.GET:
+        dest = reverse('group-list')
+
+    if dest:
+        return redirect(dest + "?" + request.META['QUERY_STRING'])
+    else:
+        context = {
+            'filter': groups_filterset,
+            'pagename': 'groups',
+        }
+        return render_to_response('groups/group_search.html', context, context_instance=RequestContext(request), )

asadb/template/index.html

@@ -7 +7 @@
 
 <ul>
+    <li><a href='{%url group-search%}'>Search groups</a></li>
     <li><a href='{%url group-list%}'>List of groups</a></li>
     <li>First Year Summer Mailing<ul>

asadb/urls.py

@@ -37 +37 @@
     # Group list
     url(r'^groups/$', groups.views.GroupListView.as_view(), name='group-list', ),
+    url(r'^groups/search/$', groups.views.search_groups, name='group-search', ),
     url(r'^group/(?P<pk>\d+)/$', groups.views.GroupDetailView.as_view(), name='group-detail', ),
     url(r'^groups/recent_changes/$', groups.views.GroupHistoryView.as_view(), name='groups-manage-history', ),