# HG changeset patch # User cavaliet # Date 1385134912 -3600 # Node ID f67f5594866fe65d4f3a982cb6bf72d72cf656c8 # Parent 27f7e1083627a523b0de0b4648a03a05e2d12683 enhance map request 0018194 diff -r 27f7e1083627 -r f67f5594866f src/jocondelab/static/jocondelab/js/front-geo.js --- a/src/jocondelab/static/jocondelab/js/front-geo.js Fri Nov 22 16:13:30 2013 +0100 +++ b/src/jocondelab/static/jocondelab/js/front-geo.js Fri Nov 22 16:41:52 2013 +0100 @@ -78,7 +78,7 @@ } } }); - loadSearchResults({ dbpedia_uri: dbpedia_uri }); + loadSearchResults({ dbpedia_uri: dbpedia_uri, thesaurus:'LIEUX' }); if (!blockHistory) { window.history.pushState("","","#"+encodeURIComponent(dbpedia_uri)); } @@ -255,7 +255,7 @@ var h = document.location.hash.replace(/^#/,''); if (/https?:\/\//.test(h)) { - loadSearchResults({dbpedia_uri: h}); + loadSearchResults({dbpedia_uri: h, thesaurus:'LIEUX'}); } var debouncedGetData = _.debounce(getData,1000); diff -r 27f7e1083627 -r f67f5594866f src/jocondelab/views/front_office.py --- a/src/jocondelab/views/front_office.py Fri Nov 22 16:13:30 2013 +0100 +++ b/src/jocondelab/views/front_office.py Fri Nov 22 16:41:52 2013 +0100 @@ -122,6 +122,8 @@ if thesaurus: if thesaurus == 'REPR': qs = qs.filter(noticeterm__term__thesaurus__label__in=['REPR','SREP']) + elif thesaurus == 'LIEUX': + qs = qs.filter(noticeterm__term__thesaurus__label__in=['LIEUX','ECOL','REPR']) else: qs = qs.filter(noticeterm__term__thesaurus__label=thesaurus) elif queryterms: