Only show raw feeds in feed autocomplete.

This commit is contained in:
Samuel Clay 2011-12-17 13:05:36 -08:00
parent 110d5206d6
commit c061aa61c2

View file

@ -41,13 +41,17 @@ def load_single_feed(request, feed_id):
@json.json_view @json.json_view
def feed_autocomplete(request): def feed_autocomplete(request):
query = request.GET['term'] query = request.GET.get('term')
if not query:
return dict(code=-1, message="Specify a search 'term'.")
feeds = [] feeds = []
for field in ['feed_address', 'feed_link', 'feed_title']: for field in ['feed_address', 'feed_link', 'feed_title']:
if not feeds: if not feeds:
feeds = Feed.objects.filter(**{ feeds = Feed.objects.filter(**{
'%s__icontains' % field: query, '%s__icontains' % field: query,
'num_subscribers__gt': 1, 'num_subscribers__gt': 1,
'branch_from_feed__isnull': True,
}).exclude( }).exclude(
Q(**{'%s__icontains' % field: 'token'}) | Q(**{'%s__icontains' % field: 'token'}) |
Q(**{'%s__icontains' % field: 'private'}) Q(**{'%s__icontains' % field: 'private'})