Эх сурвалжийг харах

HUE-2173 [search] Remove duplicate dimension add to widget

Enrico Berti 9 жил өмнө
parent
commit
653444e

+ 43 - 4
apps/search/src/search/templates/search.mako

@@ -446,7 +446,7 @@ ${ dashboard.layout_skeleton() }
               ${ _('Min Count') }
               ${ _('Min Count') }
             </span>
             </span>
             <input type="text" class="input-medium" data-bind="spinedit: properties.facets_form.mincount"/>
             <input type="text" class="input-medium" data-bind="spinedit: properties.facets_form.mincount"/>
-            <a class="pull-right" href="javascript: void(0)" data-bind="visible: ko.toJSON(properties.facets_form.field) != '', click: $root.collection.addPivotFacetValue">
+            <a class="pull-right" href="javascript: void(0)" data-bind="visible: ko.toJSON(properties.facets_form.field), click: $root.collection.addPivotFacetValue">
               <i class="fa fa-plus"></i>
               <i class="fa fa-plus"></i>
             </a>
             </a>
           </span>
           </span>
@@ -1279,7 +1279,7 @@ ${ dashboard.layout_skeleton() }
       </span>
       </span>
       <div class="filter-box" data-bind="visible: $root.isEditing() && properties.facets().length < 2" style="opacity: 0.7">
       <div class="filter-box" data-bind="visible: $root.isEditing() && properties.facets().length < 2" style="opacity: 0.7">
         <div class="title" style="border: 1px dashed #d8d8d8; border-bottom: none">
         <div class="title" style="border: 1px dashed #d8d8d8; border-bottom: none">
-          <a data-bind="visible: ko.toJSON(properties.facets_form.field) != '', click: $root.collection.addPivotFacetValue" class="pull-right" href="javascript:void(0)">
+          <a data-bind="visible: ko.toJSON(properties.facets_form.field), click: $root.collection.addPivotFacetValue" class="pull-right" href="javascript:void(0)">
             <i class="fa fa-plus"></i> ${ _('Add') }
             <i class="fa fa-plus"></i> ${ _('Add') }
           </a>
           </a>
           <select data-bind="options: $root.collection.template.fieldsNames, value: properties.facets_form.field, optionsCaption: '${ _ko('Field...') }'" class="hit-options" style="margin-bottom: 0; height: 20px"></select>
           <select data-bind="options: $root.collection.template.fieldsNames, value: properties.facets_form.field, optionsCaption: '${ _ko('Field...') }'" class="hit-options" style="margin-bottom: 0; height: 20px"></select>
@@ -1479,13 +1479,50 @@ ${ dashboard.layout_skeleton() }
 
 
 <script type="text/html" id="pie2-widget">
 <script type="text/html" id="pie2-widget">
   <!-- ko if: $root.getFacetFromQuery(id()).has_data() -->
   <!-- ko if: $root.getFacetFromQuery(id()).has_data() -->
+
   <div class="row-fluid" data-bind="with: $root.getFacetFromQuery(id())">
   <div class="row-fluid" data-bind="with: $root.getFacetFromQuery(id())">
     <div data-bind="visible: $root.isEditing, with: $root.collection.getFacetById($parent.id())" style="margin-bottom: 20px">
     <div data-bind="visible: $root.isEditing, with: $root.collection.getFacetById($parent.id())" style="margin-bottom: 20px">
-      <span data-bind="template: { name: 'facet-toggle' }">
+
+      <span data-bind="foreach: properties.facets, visible: !$parents[1].isLoading()">
+        <div class="filter-box">
+          <div class="title">
+            <a data-bind="click: function() { $root.collection.removePivotFacetValue({'pivot_facet': $parent, 'value': $data}); }" class="pull-right" href="javascript:void(0)">
+              <i class="fa fa-times"></i>
+            </a>
+            <div class="hit-title" data-bind="text: field, attr: {'title': field}"></div>
+            <div class="clearfix"></div>
+          </div>
+
+          <div class="content">
+            <div class="facet-field-cnt">
+              <span class="facet-field-label">${ _('Metric') }</span>
+              <select data-bind="options: HIT_OPTIONS, optionsText: 'label', optionsValue: 'value', value: aggregate" class="hit-options"></select>
+            </div>
+
+            <div class="facet-field-cnt" data-bind="visible: $root.isEditing()">
+              <span class="spinedit-cnt">
+                <span class="facet-field-label">
+                  ${ _('Limit') }
+                </span>
+                <input type="text" class="input-medium" data-bind="spinedit: limit"/>
+              </span>
+            </div>
+
+            <div class="facet-field-cnt" data-bind="visible: $root.isEditing()">
+              <span class="spinedit-cnt">
+                <span class="facet-field-label">
+                  ${ _('Min Count') }
+                </span>
+                <input type="text" class="input-medium" data-bind="spinedit: mincount"/>
+              </span>
+            </div>
+          </div>
+        </div>
       </span>
       </span>
+
       <div class="filter-box" data-bind="visible: $root.isEditing() && properties.facets().length < 2" style="opacity: 0.7">
       <div class="filter-box" data-bind="visible: $root.isEditing() && properties.facets().length < 2" style="opacity: 0.7">
         <div class="title" style="border: 1px dashed #d8d8d8; border-bottom: none">
         <div class="title" style="border: 1px dashed #d8d8d8; border-bottom: none">
-          <a data-bind="visible: ko.toJSON(properties.facets_form.field) != '', click: $root.collection.addPivotFacetValue" class="pull-right" href="javascript:void(0)">
+          <a data-bind="visible: ko.toJSON(properties.facets_form.field), click: $root.collection.addPivotFacetValue" class="pull-right" href="javascript:void(0)">
             <i class="fa fa-plus"></i> ${ _('Add') }
             <i class="fa fa-plus"></i> ${ _('Add') }
           </a>
           </a>
           <select data-bind="options: $root.collection.template.fieldsNames, value: properties.facets_form.field, optionsCaption: '${ _ko('Field...') }'" class="hit-options" style="margin-bottom: 0; height: 20px"></select>
           <select data-bind="options: $root.collection.template.fieldsNames, value: properties.facets_form.field, optionsCaption: '${ _ko('Field...') }'" class="hit-options" style="margin-bottom: 0; height: 20px"></select>
@@ -1522,6 +1559,8 @@ ${ dashboard.layout_skeleton() }
       </div>
       </div>
     </div>
     </div>
 
 
+    <div class="clearfix"></div>
+
     <div data-bind="with: $root.collection.getFacetById($parent.id())">
     <div data-bind="with: $root.collection.getFacetById($parent.id())">
       <!-- ko if: type() == 'range' -->
       <!-- ko if: type() == 'range' -->
       <div data-bind="pieChart: {data: {counts: $parent.counts(), widget_id: $parent.id()}, field: field, fqs: $root.query.fqs,
       <div data-bind="pieChart: {data: {counts: $parent.counts(), widget_id: $parent.id()}, field: field, fqs: $root.query.fqs,