diff --git a/conservancy/podjango/views.py b/conservancy/podjango/views.py index 28e7ffa902311af9b5a115759987a75574c51e57..ae81663db3bd052fc5141672860717e6c65b7444 100644 --- a/conservancy/podjango/views.py +++ b/conservancy/podjango/views.py @@ -21,9 +21,8 @@ from functools import reduce from operator import or_ from django.shortcuts import get_object_or_404, render -from django.views.generic.list import ListView -from .models import Cast, CastTag +from .models import CastTag def OR_filter(field_name, objs): @@ -31,9 +30,11 @@ def OR_filter(field_name, objs): return reduce(or_, [Q(**{field_name: x.id}) for x in objs]) + def last_name(person): return person.formal_name.rpartition(' ')[2] + def custom_index(request, queryset, *args, **kwargs): """Cast list view that allows scrolling and also shows an index by year. @@ -75,6 +76,7 @@ def custom_index(request, queryset, *args, **kwargs): # TODO return render(request, 'podjango/cast/cast_list.html', {'object_list': queryset}) + def query(request): """Page to query the cast based on and tags """ @@ -82,15 +84,15 @@ def query(request): if request.GET: d = request.GET.copy() if 'authors' in d.getlist('all'): - d.setlist('author', []) # remove author queries + d.setlist('author', []) # remove author queries if 'tags' in d.getlist('all'): - d.setlist('tag', []) # remove tag queries - d.setlist('all', []) # remove "all" from the query string + d.setlist('tag', []) # remove tag queries + d.setlist('all', []) # remove "all" from the query string base_url = '/cast/' if 'rss' in d: base_url = '/feeds/cast/' - d.setlist('rss', []) # remove it + d.setlist('rss', []) # remove it query_string = d.urlencode() @@ -100,6 +102,7 @@ def query(request): tags = CastTag.objects.all().order_by('label') return render(request, 'podjango/cast/query.html', {'tags': tags}) + def relative_redirect(request, path): from django import http from django.conf import settings