浏览代码

HUE-2981 [search] Disable prefix parameter because of numeric fields

Romain Rigaux 8 年之前
父节点
当前提交
e238410
共有 2 个文件被更改,包括 8 次插入9 次删除
  1. 6 6
      apps/search/src/search/templates/common_search.mako
  2. 2 3
      desktop/libs/libsolr/src/libsolr/api.py

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

@@ -537,7 +537,7 @@ ${ dashboard.layout_skeleton() }
     <!-- /ko -->
     <!-- /ko -->
 
 
 
 
-    <div class="facet-field-cnt">
+    <div class="facet-field-cnt hide">
       <span class="spinedit-cnt">
       <span class="spinedit-cnt">
         <span class="facet-field-label facet-field-label-fixed-width">
         <span class="facet-field-label facet-field-label-fixed-width">
           ${ _('Limit') }
           ${ _('Limit') }
@@ -546,7 +546,7 @@ ${ dashboard.layout_skeleton() }
       </span>
       </span>
     </div>
     </div>
 
 
-    <div class="facet-field-cnt">
+    <div class="facet-field-cnt hide">
       <span class="spinedit-cnt">
       <span class="spinedit-cnt">
         <span class="facet-field-label facet-field-label-fixed-width">
         <span class="facet-field-label facet-field-label-fixed-width">
           ${ _('Min Count') }
           ${ _('Min Count') }
@@ -591,7 +591,7 @@ ${ dashboard.layout_skeleton() }
           </span>
           </span>
         </div>
         </div>
 
 
-        <div class="facet-field-cnt" data-bind="visible: $root.isEditing()">
+        <div class="facet-field-cnt hide">
           <span class="spinedit-cnt">
           <span class="spinedit-cnt">
             <span class="facet-field-label">
             <span class="facet-field-label">
               ${ _('Limit') }
               ${ _('Limit') }
@@ -600,7 +600,7 @@ ${ dashboard.layout_skeleton() }
           </span>
           </span>
         </div>
         </div>
 
 
-        <div class="facet-field-cnt" data-bind="visible: $root.isEditing()">
+        <div class="facet-field-cnt hide"">
           <span class="spinedit-cnt">
           <span class="spinedit-cnt">
             <span class="facet-field-label">
             <span class="facet-field-label">
               ${ _('Min Count') }
               ${ _('Min Count') }
@@ -675,7 +675,7 @@ ${ dashboard.layout_skeleton() }
         </span>
         </span>
       </div>
       </div>
 
 
-      <div class="facet-field-cnt">
+      <div class="facet-field-cnt hide">
         <span class="spinedit-cnt">
         <span class="spinedit-cnt">
           <span class="facet-field-label">
           <span class="facet-field-label">
             ${ _('Limit') }
             ${ _('Limit') }
@@ -684,7 +684,7 @@ ${ dashboard.layout_skeleton() }
         </span>
         </span>
       </div>
       </div>
 
 
-      <div class="facet-field-cnt">
+      <div class="facet-field-cnt hide">
         <span class="spinedit-cnt">
         <span class="spinedit-cnt">
           <span class="facet-field-label">
           <span class="facet-field-label">
             ${ _('Min Count') }
             ${ _('Min Count') }

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

@@ -146,7 +146,6 @@ class SolrApi(object):
               'mincount': int(facet['properties']['mincount']),
               'mincount': int(facet['properties']['mincount']),
               'sort': {'count': facet['properties']['sort']},
               'sort': {'count': facet['properties']['sort']},
           }
           }
-          print facet
 
 
           if facet['properties']['domain'].get('blockParent') or facet['properties']['domain'].get('blockChildren'):
           if facet['properties']['domain'].get('blockParent') or facet['properties']['domain'].get('blockChildren'):
             _f['domain'] = {}
             _f['domain'] = {}
@@ -172,7 +171,7 @@ class SolrApi(object):
                 'offset': 0,
                 'offset': 0,
                 'numBuckets': True,
                 'numBuckets': True,
                 'allBuckets': True,
                 'allBuckets': True,
-                'prefix': ''
+                #'prefix': '' # Forbidden on numeric fields
             })
             })
             if facet['properties']['canRange'] and not facet['properties']['isDate']:
             if facet['properties']['canRange'] and not facet['properties']['isDate']:
               del _f['mincount'] # Numeric fields do not support
               del _f['mincount'] # Numeric fields do not support
@@ -276,7 +275,7 @@ class SolrApi(object):
           'mincount': int(facet['mincount']),
           'mincount': int(facet['mincount']),
           'numBuckets': True,
           'numBuckets': True,
           'allBuckets': True,
           'allBuckets': True,
-          'prefix': ''
+          #'prefix': '' # Forbidden on numeric fields
       }
       }
       if widget['widgetType'] == 'tree2-widget' and facets[-1]['aggregate']['function'] != 'count':
       if widget['widgetType'] == 'tree2-widget' and facets[-1]['aggregate']['function'] != 'count':
         _f['subcount'] = self._get_aggregate_function(facets[-1])
         _f['subcount'] = self._get_aggregate_function(facets[-1])