Преглед изворни кода

HUE-2173 [search] Apply sort on value of function when using an aggregate

Romain Rigaux пре 9 година
родитељ
комит
34b3ab2

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

@@ -505,7 +505,7 @@ ${ dashboard.layout_skeleton() }
 <script type="text/html" id="facet-toggle2">
 
     ## Dimension 1
-    <!-- ko if: properties.canRange -->
+    <!-- ko if: properties.canRange() && typeof properties.type != "undefined" -->
     <div class="facet-field-cnt">
       <span class="facet-field-label facet-field-label-fixed-width">${ _('Type') }</span>
       <a href="javascript: void(0)" title="${ _('Toggle how to group the values') }" data-bind="click: $root.collection.toggleRangeFacet">

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

@@ -166,7 +166,7 @@ def search(request):
       try:
         response['error'] = json.loads(e.message)['error']['msg']
       except:
-        LOG.exception('failed to parse json response')
+        LOG.exception('failed to parse json response: %s') % force_unicode(e)
         response['error'] = force_unicode(e)
     except Exception, e:
       raise PopupException(e, title=_('Error while accessing Solr'))

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

@@ -374,6 +374,8 @@ class SolrApi(object):
               _f['facet'] = {
                   'd2': self._get_aggregate_function(facet['properties']['facets'][0])
               }
+              _f['sort'] = {'d2': facet['properties']['sort']}
+              # filter = '-d2:NaN' # Solr 6.4
 
           json_facets[facet['id']] = _f
         elif facet['type'] == 'function':