enhance map request 0018194
authorcavaliet
Fri, 22 Nov 2013 16:41:52 +0100
changeset 198 f67f5594866f
parent 197 27f7e1083627
child 199 86ac564d0594
enhance map request 0018194
src/jocondelab/static/jocondelab/js/front-geo.js
src/jocondelab/views/front_office.py
--- 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);
--- 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: