From c061aa61c264f20848343403c37e45cfab35d88a Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Sat, 17 Dec 2011 13:05:36 -0800 Subject: [PATCH] Only show raw feeds in feed autocomplete. --- apps/rss_feeds/views.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/rss_feeds/views.py b/apps/rss_feeds/views.py index e50f2689c..b6a02d336 100644 --- a/apps/rss_feeds/views.py +++ b/apps/rss_feeds/views.py @@ -41,13 +41,17 @@ def load_single_feed(request, feed_id): @json.json_view 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 = [] for field in ['feed_address', 'feed_link', 'feed_title']: if not feeds: feeds = Feed.objects.filter(**{ '%s__icontains' % field: query, 'num_subscribers__gt': 1, + 'branch_from_feed__isnull': True, }).exclude( Q(**{'%s__icontains' % field: 'token'}) | Q(**{'%s__icontains' % field: 'private'})