--- a/web/hdalab/views/ajax.py Thu Oct 11 18:22:45 2012 +0200
+++ b/web/hdalab/views/ajax.py Thu Oct 18 18:05:56 2012 +0200
@@ -126,6 +126,7 @@
'description': datasheet.description,
'hda_id': datasheet.hda_id,
'organization': datasheet.organisation.name,
+ 'organization_url': datasheet.organisation.website,
'score': max(dsscore, rootscore)
})
cleantags(resobj)
@@ -336,7 +337,7 @@
cont_count = contentqs.count()
- contenus = dict([(content.id, {'score' : 0, 'tags' : [], 'id':content.id, 'title': content.title, 'description': content.description, 'url': content.url}) for content in contentqs[0:content_count]])
+ contenus = dict([(content.id, {'score' : 0, 'tags' : [], 'hda_id': content.hda_id, 'id':content.id, 'title': content.title, 'description': content.description, 'url': content.url}) for content in contentqs[0:content_count]])
contentids = contenus.keys()
qs = DatasheetExtras.objects.select_related('insee').filter(datasheet__in = contentids)
@@ -424,7 +425,7 @@
datasheets = Datasheet.objects.filter(validated = True, taggedsheet__tag__label__iexact = label, taggedsheet__order__lte = MAX_TAG_ORDER).annotate(tagorder=Min('taggedsheet__order')).select_related('organisation').distinct()
- contents = [{ 'description': ds.description, 'title': ds.title, 'url': ds.url, 'score': int((MAX_TAG_ORDER - ds.tagorder)/2), 'id': ds.id, 'hda_id': ds.hda_id, 'organization': ds.organisation.name } for ds in datasheets]
+ contents = [{ 'description': ds.description, 'title': ds.title, 'url': ds.url, 'score': int((MAX_TAG_ORDER - ds.tagorder)/2), 'id': ds.id, 'hda_id': ds.hda_id, 'organization': ds.organisation.name, 'organization_url': ds.organisation.website } for ds in datasheets]
contents = sorted(contents, key=lambda e: -e['score'])