--- a/web/hdalab/views/ajax.py Mon Jul 02 19:19:02 2012 +0200
+++ b/web/hdalab/views/ajax.py Tue Jul 03 17:50:26 2012 +0200
@@ -138,7 +138,7 @@
if len(tag_list):
contents = []
- datasheets = Datasheet.objects.select_related('taggedsheet__tag').filter(taggedsheet__tag__label__in = tag_list, taggedsheet__order__lte = MAX_TAG_ORDER).distinct()
+ datasheets = Datasheet.objects.select_related('taggedsheet__tag').filter(validated = True, taggedsheet__tag__label__in = tag_list, taggedsheet__order__lte = MAX_TAG_ORDER).distinct()
for datasheet in datasheets:
# Calculating where we add the datasheet in the tree
maintag = None
@@ -151,7 +151,7 @@
maintagscore = score
maintag = label
if maintag is not None:
- globtags[maintag]['access']['contents'].append({'id': datasheet.id, 'title': datasheet.title})
+ globtags[maintag]['access']['contents'].append({'id': datasheet.id, 'title': datasheet.title, 'url': datasheet.url})
cleantags(resobj)
# resobj['contents'] = [{'id': d.id, 'title': d.title, 'tags': [t.label for t in d.tags.filter(taggedsheet__order__lte=5)]} for d in datasheets]
@@ -226,6 +226,15 @@
return HttpResponse(content=json.dumps(res), mimetype='application/json')
+def catsearch(request):
+
+ q = request.GET.get('term',None)
+
+ qs = WpCategory.objects.filter( Q(label__icontains = ' ' + q ) | Q(label__istartswith = q))
+
+ res = [{'value':t.label} for t in qs]
+
+ return HttpResponse(content=json.dumps(res), mimetype='application/json')
def filter(request):