Commit 6c8ed118 authored by Frédéric MENU's avatar Frédéric MENU

Fix issue #230

parent 05cab9bd
...@@ -204,7 +204,13 @@ class FacetSet extends RequestBuilder implements ComponentRequestBuilderInterfac ...@@ -204,7 +204,13 @@ class FacetSet extends RequestBuilder implements ComponentRequestBuilderInterfac
*/ */
public function addFacetPivot($request, $facet) public function addFacetPivot($request, $facet)
{ {
$request->addParam('facet.pivot', implode(',', $facet->getFields())); $request->addParam(
'facet.pivot',
$this->renderLocalParams(
implode(',', $facet->getFields()),
array('key' => $facet->getKey(), 'ex' => $facet->getExcludes())
)
);
$request->addParam('facet.pivot.mincount', $facet->getMinCount(), true); $request->addParam('facet.pivot.mincount', $facet->getMinCount(), true);
} }
} }
...@@ -177,13 +177,15 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase ...@@ -177,13 +177,15 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
public function testBuildWithPivotFacet() public function testBuildWithPivotFacet()
{ {
$this->component->addFacet(new FacetPivot( $facet = new FacetPivot(
array( array(
'key' => 'f1', 'key' => 'f1',
'fields' => 'cat,inStock', 'fields' => 'cat,inStock',
'mincount' => 123 'mincount' => 123
) )
)); );
$facet->addExclude('owner');
$this->component->addFacet($facet);
$request = $this->builder->buildComponent($this->component, $this->request); $request = $this->builder->buildComponent($this->component, $this->request);
...@@ -193,7 +195,7 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase ...@@ -193,7 +195,7 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
); );
$this->assertEquals( $this->assertEquals(
'?facet=true&facet.pivot=cat,inStock&facet.pivot.mincount=123', '?facet=true&facet.pivot={!key=f1 ex=owner}cat,inStock&facet.pivot.mincount=123',
urldecode($request->getUri()) urldecode($request->getUri())
); );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment