Bläddra i källkod

HUE-7062 [autocomplete] Link formula to the autocomplete

Romain Rigaux 8 år sedan
förälder
incheckning
4a8896b

+ 1 - 1
desktop/libs/dashboard/src/dashboard/templates/common_search.mako

@@ -2007,7 +2007,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
       <div class="clearfix"></div>
       <br/>
 
-      <div data-bind="component: { name: 'hue-simple-ace-editor', params: { value: formula, autocomplete: 'solrFormula', singleLine: true } }"></div>
+      <div data-bind="component: { name: 'hue-simple-ace-editor', params: { value: formula, autocomplete: 'solrFormula', singleLine: true } }, visible: $parent.field() == 'formula'"></div>
       <input data-bind="value: plain_formula" type="hidden"></input>
 
       <!-- ko if: $data.function() != 'field' && $parents[1].widgetType() != 'hit-widget' -->

+ 5 - 15
desktop/libs/libsolr/src/libsolr/api.py

@@ -804,24 +804,14 @@ class SolrApi(object):
 
   @classmethod
   def _get_aggregate_function(cls, facet):
-    if 'properties' in facet:
-      f = facet['properties']['aggregate'] # Level 1 facet
-    else:
-      f = facet['aggregate']
-
-    if not f['formula']:
-      f['formula'] = facet['field']
-
-    return cls.__get_aggregate_function(f)
+    f = facet['aggregate']
 
-  @classmethod
-  def __get_aggregate_function(cls, f):
-    if f['function'] == 'field':
+    if f['formula']:
+      return f['formula']
+    elif f['function'] == 'field':
       return f['value']
     else:
-      fields = []
-      if f['formula']:
-        fields.append(f['formula'])
+      fields = [facet['field']]
       if f['function'] == 'median':
         f['function'] = 'percentile'
         fields.append('50')