Selaa lähdekoodia

[search] Improve detection of date type of facets

Fix stats query without a query object
Fix range selection of pivot facet
Fix loading leaflet with some missing labels
Romain Rigaux 11 vuotta sitten
vanhempi
commit
c1bce4b06e

+ 1 - 1
apps/search/src/search/api.py

@@ -68,7 +68,7 @@ def _guess_range_facet(widget_type, solr_api, collection, facet_field, propertie
         gap = int((end - start) / SLOTS)
       if gap < 1:
         gap = 1
-    elif 'T' in stat_facet['min']:
+    elif re.match('\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\dZ', stat_facet['min']):
       is_date = True
       stats_min = stat_facet['min']
       stats_max = stat_facet['max']

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

@@ -314,6 +314,15 @@ var Collection = function (vm, collection) {
     vm.results.removeAll();
     vm.search();
   });
+  if (self.template.leafletmap.latitudeField == undefined) {
+    self.template.leafletmap.latitudeField = ko.observable();
+  }
+  if (self.template.leafletmap.longitudeField == undefined) {
+    self.template.leafletmap.longitudeField = ko.observable();
+  }
+  if (self.template.leafletmap.labelField == undefined) {
+    self.template.leafletmap.labelField = ko.observable();
+  }
 
   self.template.leafletmapOn = ko.computed(function() {
     return self.template.leafletmap.latitudeField() != null && self.template.leafletmap.longitudeField() != null;

+ 1 - 0
desktop/core/static/js/nv.d3.multiBarWithBrushChart.js

@@ -658,6 +658,7 @@ nv.models.multiBarWithBrushChart = function() {
 
   chart.hideSelection = function() {
     selectionHidden = true;
+    selectionEnabled = false;
     return chart;
   }
 

+ 2 - 1
desktop/libs/libsolr/src/libsolr/api.py

@@ -374,7 +374,8 @@ class SolrApi(object):
           ('stats', 'true'),
       )
 
-      params += self._get_fq(query)
+      if query is not None:
+        params += self._get_fq(query)
 
       if facet:
         params += (('stats.facet', facet),)