diff -r ca6382096bb1 -r ebc92daef815 web/hdalab/views/ajax.py --- a/web/hdalab/views/ajax.py Mon Mar 19 16:33:50 2012 +0100 +++ b/web/hdalab/views/ajax.py Fri Apr 20 10:51:34 2012 +0200 @@ -129,7 +129,7 @@ q = request.GET.get('term',None) if q: lq = q.lower() - qs = Tag.objects.filter( Q(label__icontains = q ) | Q(dbpedia_fields__translations__label__icontains = q, dbpedia_fields__translations__language_code=request.LANGUAGE_CODE), ~Q(dbpedia_uri = None)) if q else Tag.objects.filter(~Q(dbpedia_uri = None)) + qs = Tag.objects.filter(datasheet__validated=True).filter( Q(label__icontains = q ) | Q(dbpedia_fields__translations__label__icontains = q, dbpedia_fields__translations__language_code=request.LANGUAGE_CODE), ~Q(dbpedia_uri = None)) if q else Tag.objects.filter(~Q(dbpedia_uri = None)) qs = qs.annotate(nb=Count('datasheet')).order_by('-nb')[:20] qslist = list(qs)