Merge pull request #78 from networkteam/query-dimension-filter

[BUGFIX] Correctly filter for dimension combinations in query

Author: hlubek

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Eel/ElasticSearchQueryBuilder.php

@@ -626,6 +626,11 @@ public function query(NodeInterface $contextNode) {
 		// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-terms-filter.html
 		$this->queryFilter('terms', array('__workspace' => array_unique(array('live', $contextNode->getContext()->getWorkspace()->getName()))));
 
+		// match exact dimension values for each dimension, this works because the indexing flattens the node variants for all dimension preset combinations
+		foreach ($contextNode->getContext()->getDimensions() as $dimensionName => $dimensionValues) {
+			$this->queryFilter('terms', array('__dimensionCombinations.' . $dimensionName => $dimensionValues, 'execution' => 'and'));
+		}
+
 		$this->contextNode = $contextNode;
 
 		return $this;