Fixed project search

The project ID wasn't used at all when searching in a project's context.

src/scripts/elasticsearch.js

@@ -17,26 +17,28 @@ $(document).ready(function() {
     var sliderTemplate = Hogan.compile($('#slider-template').text());
     var paginationTemplate = Hogan.compile($('#pagination-template').text());
 
-    // something elasticy!
+    // defined in tutti/4_search.js
     var search = elasticSearcher;
 
     // what are we looking for? users? assets (default)
     what = $inputField.attr('what');
 
-    // Input binding
-    $inputField.on('keyup change', function() {
-        var query = $inputField.val();
-
+    function do_search(query) {
         if (query === undefined) {
             return;
         }
-
         toggleIconEmptyInput(!query.trim());
 
-        // what could be like "/users"
-        search.setQuery(query, what);
-        // setURLParams(search);
+        search.setQuery(query, what);  // what could be like "/users"
+        var pid = ProjectUtils.projectId();
+        if (pid) search.setProjectID(pid);
         search.execute();
+    }
+
+    // Input binding
+    $inputField.on('keyup change', function() {
+        var query = $inputField.val();
+        do_search(query);
     }).focus();
 
     search.on('results', function(content) {
@@ -330,6 +332,5 @@ $(document).ready(function() {
     }
 
     // do empty search to fill aggregations
-    search.setQuery('', what);
-    search.execute();
+    do_search('');
 });

src/scripts/tutti/4_search.js

@@ -8,6 +8,7 @@ var elasticSearcher = (function() {
   var deze = {
 
     query:"",
+    project_id:"",
     url:"",
     newhits: [],
     terms: {},
@@ -21,6 +22,10 @@ var elasticSearcher = (function() {
       }
     }),
 
+    setProjectID: (function(pid){
+      deze.project_id = pid;
+    }),
+
     setCurrentPage: (function(page){
       if(page === undefined){
         return;
@@ -66,6 +71,7 @@ var elasticSearcher = (function() {
       params = {
         q: deze.query,
         page: deze.page,
+        project: deze.project_id,
       };
       //add term filters
       Object.assign(params, deze.terms);
@@ -105,6 +111,7 @@ var elasticSearcher = (function() {
     execute: deze.execute,
     on: deze.on,
     setQuery: deze.setQuery,
+    setProjectID: deze.setProjectID,
     setCurrentPage: deze.setCurrentPage,
     query: deze.query,
     page: deze.page,