Changeset 1de230f

Timestamp:

Aug 24, 2011, 2:42:50 AM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

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

Children:

7b57a9b

Parents:

3107c52

git-author:

Alex Dehnert <adehnert@…> (08/24/11 02:42:35)

git-committer:

Alex Dehnert <adehnert@…> (08/24/11 02:42:50)

Message:

Add group search

This introduces a dependency on django-filters ---
​https://github.com/alex/django-filter.

Location:

asadb

Files:

• groups/views.py (modified) (2 diffs)
• settings.py (modified) (2 diffs)
• template/groups/group_list.html (modified) (1 diff)
• urls.py (modified) (1 diff)

asadb/groups/views.py

@@ -24 +24 @@
 import form_utils.forms
 import reversion.models
+import django_filters
 
 from util.db_form_utils import StaticWidget
@@ -170 +171 @@
     }
     return render_to_response('groups/group_change_main.html', context, context_instance=RequestContext(request), )
+
+
+class GroupFilter(django_filters.FilterSet):
+    name = django_filters.CharFilter(lookup_type='icontains', label="Name contains")
+    abbreviation = django_filters.CharFilter(lookup_type='iexact', label="Abbreviation is")
+
+    class Meta:
+        model = groups.models.Group
+        fields = [
+            'name',
+            'abbreviation',
+            'activity_category',
+            'group_class',
+            'group_status',
+            'group_funding',
+        ]
+
+
+class GroupListView(ListView):
+    model = groups.models.Group
+    template_object_name = 'group'
+
+    def get(self, *args, **kwargs):
+        qs = super(GroupListView, self).get_queryset()
+        self.filterset = GroupFilter(self.request.GET, qs)
+        return super(GroupListView, self).get(*args, **kwargs)
+
+    def get_queryset(self, ):
+        qs = self.filterset.qs
+        return qs
+
+    def get_context_data(self, **kwargs):
+        context = super(GroupListView, self).get_context_data(**kwargs)
+        # Add in the publisher
+        context['pagename'] = 'groups'
+        context['filter'] = self.filterset
+        return context
 
 

asadb/settings.py

@@ -5 +5 @@
 SITE_ROOT = os.path.normpath(os.path.dirname(__file__))
 SITE_WEB_PATH = ''
-
 
 DEBUG = False
@@ -105 +104 @@
     'django.contrib.sites',
     'form_utils',
+    'django_filters',
     'reversion',
     'south',

asadb/template/groups/group_list.html

@@ -5 +5 @@
 
 <h1>MIT Student Groups</h1>
+
+<h2>Search</h2>
+
+<form action="" method="get">
+    <table class='pretty-table'>
+    {{ filter.form.as_table }}
+    </table>
+    <input type="submit" value="Search" />
+</form>
+
+<h2>The Groups</h2>
 
 <table class='pretty-table'>

asadb/urls.py

@@ -36 +36 @@
 
     # Group list
-    url(
-        r'^groups/$',
-        list_detail.object_list,
-        {
-            'queryset': groups.models.Group.objects.all(),
-            'template_object_name': 'group',
-            'extra_context': {'pagename': 'groups', },
-        },
-        name='group-list',
-    ),
+    url(r'^groups/$', groups.views.GroupListView.as_view(), name='group-list', ),
     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', ),