added type param

sulu · Aug 2, 2016 · 33d6148 · 33d6148
1 parent 835493b
commit 33d6148
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/Content/ArticleDataProvider.php b/Content/ArticleDataProvider.php
@@ -21,6 +21,7 @@
 use ProxyManager\Proxy\LazyLoadingInterface;
 use Sulu\Bundle\ArticleBundle\Document\ArticleDocument;
 use Sulu\Bundle\ArticleBundle\Document\ArticleOngrDocument;
+use Sulu\Component\Content\Compat\PropertyParameter;
 use Sulu\Component\DocumentManager\DocumentManagerInterface;
 use Sulu\Component\SmartContent\Configuration\Builder;
 use Sulu\Component\SmartContent\DataProviderInterface;
@@ -81,7 +82,7 @@ public function getConfiguration()
      */
     public function getDefaultPropertyParameter()
     {
-        return [];
+        return ['type' => new PropertyParameter('type', null)];
     }
 
     /**
@@ -95,6 +96,10 @@ public function resolveDataItems(
         $page = 1,
         $pageSize = null
     ) {
+        if (array_key_exists('type', $propertyParameter) && null !== ($type = $propertyParameter['type']->getValue())) {
+            $filters['type'] = $type;
+        }
+
         $result = [];
         $uuids = [];
         /** @var ArticleOngrDocument $document */
@@ -117,6 +122,10 @@ public function resolveResourceItems(
         $page = 1,
         $pageSize = null
     ) {
+        if (array_key_exists('type', $propertyParameter) && null !== ($type = $propertyParameter['type']->getValue())) {
+            $filters['type'] = $type;
+        }
+
         $result = [];
         $uuids = [];
         /** @var ArticleOngrDocument $document */
@@ -167,6 +176,11 @@ private function getSearchResult(array $filters, $limit, $page, $pageSize)
         $operator = $this->getFilter($filters, 'websiteCategoriesOperator', 'or');
         $this->addBoolQuery('websiteCategories', $filters, 'excerpt.categories', $operator, $query, $queriesCount);
 
+        if (array_key_exists('type', $filters)) {
+            $query->add(new TermQuery('type', $filters['type']));
+            $queriesCount++;
+        }
+
         if (0 === $queriesCount) {
             $search->addQuery(new MatchAllQuery());
         } else {

diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -85,7 +85,7 @@
         <service id="sulu_article.content.data_provider.proxy_factory"
                  class="ProxyManager\Factory\LazyLoadingValueHolderFactory"/>
         <service id="sulu_article.content.data_provider" class="Sulu\Bundle\ArticleBundle\Content\ArticleDataProvider">
-            <argument type="service" id="es.manager.default"/>
+            <argument type="service" id="es.manager.live"/>
             <argument type="service" id="sulu_document_manager.document_manager"/>
             <argument type="service" id="sulu_article.content.data_provider.proxy_factory"/>