Bläddra i källkod

[search] Zooming out does not reset filter

Romain Rigaux 11 år sedan
förälder
incheckning
8132720fb8

+ 1 - 1
apps/search/src/search/templates/search.mako

@@ -1187,7 +1187,7 @@ $(document).ready(function () {
     }, 200);
   });
 
-  $(document).on("showDoc", function(e, doc){
+  $(document).on("showDoc", function(e, doc) {
     viewModel.collection.selectedDocument(doc);
     var _docDetailsRow = $("#doc_" + doc[viewModel.collection.idField()] + "_details");
     var _doc = {

+ 6 - 0
apps/search/static/js/search.ko.js

@@ -714,6 +714,12 @@ var Collection = function (vm, collection) {
           facet.properties.start(data.properties.start);
           facet.properties.end(data.properties.end);
           facet.properties.gap(data.properties.gap);
+          
+          var fq = vm.query.getFacetFilter(facet_json.id);
+          if (fq != null) {
+            fq.properties()[0].from(data.properties.start);
+            fq.properties()[0].to(data.properties.end);
+          }
         }
       },
       async: false

+ 1 - 1
desktop/libs/indexer/src/indexer/conf.py

@@ -29,7 +29,7 @@ def solrctl():
   solrctl path
   """
   try:
-    return subprocess.check_output(['which', 'solrctl'])
+    return subprocess.check_output(['which', 'solrctl']).strip()
   except subprocess.CalledProcessError:
     return '/usr/bin/solrctl'
 

+ 1 - 1
desktop/libs/indexer/src/indexer/controller.py

@@ -92,7 +92,7 @@ class CollectionManagerController(object):
                                stderr=subprocess.PIPE,
                                env={
                                  'SOLR_HOME': conf.SOLR_HOME.get(),
-                                 'SOLR_ZK_ENSEMBLE': conf.SOLR_ZK_ENSEMBLE.get()
+                                 'SOLR_ZK_ENSEMBLE': 'conf.SOLR_ZK_ENSEMBLE.get()'
                                })
     status = process.wait()