default search: only in active

slidewiki · Nov 28, 2016 · 9ce0553 · 9ce0553
1 parent 0cc8317
commit 9ce0553
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/application/solr/helper.js b/application/solr/helper.js
@@ -72,7 +72,8 @@ module.exports = {
             childFilters.push('tags:' + params.tags);
         }
 
-        if(params.revisions === 'false'){
+        // if param revisions is not set, search only in active revisions
+        if(params.revisions === 'false' || !params.hasOwnProperty('revisions')){
             childFilters.push('active:true');
         }
 

diff --git a/application/solr/searchResults.js b/application/solr/searchResults.js
@@ -33,9 +33,9 @@ module.exports = {
                 '&sort=score desc, lastUpdate desc' +
                 '&revisions.q=' + solr_params.childQ + ' AND {!terms f=solr_parent_id v=$row.solr_id}' +
                 '&revisions.fq=' + solr_params.childFQ +
-                '&revisions.sort=score desc, id desc' +
+                '&revisions.sort=score desc, lastUpdate desc' +
                 '&rows=50&wt=json';
-
+                
             // let requestUri = 'http://' + solrUri + queryString;
             solrClient.query(queryString).then( (resp) => {
                 this.checkResponse(resp).then( (res) => {