Browse Source

HUE-2128 [search] Timeline dates are not loaded properly

Romain Rigaux 11 years ago
parent
commit
55e742a

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

@@ -743,7 +743,7 @@ ${ commonheader(_('Search'), "search", user, "80px") | n,unicode }
       <span class="facet-field-label">${ _('Zoom') }</span>
       <a href="javascript:void(0)" data-bind="click: $root.collection.timeLineZoom"><i class="fa fa-search-minus"></i> ${ _('reset') }</a>
       <span class="facet-field-label">${ _('Group by') }</span>
-      <select class="input-medium" data-bind="options: $root.query.multiqs, optionsValue: 'id',optionsText: 'label', value: $root.query.selectedMultiq"></select>
+      <select class="input-medium" data-bind="options: $root.query.multiqs, optionsValue: 'id', optionsText: 'label', value: $root.query.selectedMultiq"></select>
     </div>
 
     <div data-bind="timelineChart: {datum: {counts: counts, extraSeries: extraSeries, widget_id: $parent.id(), label: label}, stacked: $root.collection.getFacetById($parent.id()).properties.stacked(), field: field, label: label, transformer: timelineChartDataTransformer,

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

@@ -209,14 +209,18 @@ var Query = function (vm, query) {
 
   var defaultMultiqGroup = {'id': 'query', 'label': 'query'};
   self.multiqs = ko.computed(function () { // List of widgets supporting multiqs
-  var histogram_id = vm.collection.getHistogramFacet();
+    var histogram_id = vm.collection.getHistogramFacet();
     return [defaultMultiqGroup].concat(
         $.map($.grep(self.fqs(), function(fq, i) {
             return (fq.type() == 'field' || fq.type() == 'range') && (histogram_id == null || histogram_id.id() != fq.id());
         }), function(fq) { return {'id': fq.id(), 'label': fq.field()} })
       );
   });
-  self.selectedMultiq = ko.observable(defaultMultiqGroup);
+
+  self.selectedMultiq = ko.observable('query');
+  self.selectedMultiq.subscribe(function () {
+    vm.search();
+  });
 
   self.getFacetFilter = function(widget_id) {
     var _fq = null;
@@ -245,10 +249,6 @@ var Query = function (vm, query) {
     return null;
   });
 
-  self.selectedMultiq.subscribe(function () { // To keep below the computed
-    vm.search();
-  });
-
   self.addQ = function (data) {
     self.qs.push(ko.mapping.fromJS({'q': ''}));
   };