diff -r ba6056f58516 -r c05567404888 src/p4l/views.py --- a/src/p4l/views.py Fri Sep 20 15:44:11 2013 +0200 +++ b/src/p4l/views.py Fri Sep 20 22:21:48 2013 +0200 @@ -5,43 +5,19 @@ @author: tc ''' from datetime import datetime +import json +import logging + from django.conf import settings -from django.views.generic import ListView, DetailView, View from django.shortcuts import redirect, get_object_or_404 -from p4l.forms import RecordFilterForm +from django.views.generic import DetailView, View + from p4l.models import Record from p4l.utils import get_labels_for_uris -import json -import logging logger = logging.getLogger(__name__) -class RecordListView(ListView): - - queryset = Record.objects.select_related("language").prefetch_related('titles', 'imprints').order_by('identifier') # @UndefinedVariable - paginate_by = settings.NB_RECORDS_BY_PAGE - template_name = "p4l/p4l_home.html" - form_class = RecordFilterForm - - def get_context_data(self, **kwargs): - context = ListView.get_context_data(self, **kwargs) - context['filter_form'] = self.form_class() - # Add filter params from GET params - filter_params = {} - if 'title' in self.request.GET: - filter_params['title'] = self.request.GET['title'] - context['filter_params'] = filter_params - return context - - def get_queryset(self): - qs = super(RecordListView, self).get_queryset() - filter_form = self.form_class(self.request.GET) - if filter_form.is_valid(): - return filter_form.get_filter_qs(qs) - else: - return qs - class RecordDetailView(DetailView):