added category and tags to ongr-index (#9)

* fixed extension tabs * added tags and categories to ongr index
sulu · Jul 27, 2016 · cec35da · cec35da
1 parent f035aa7
commit cec35da
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 6 deletions.
diff --git a/Document/ArticleOngrDocument.php b/Document/ArticleOngrDocument.php
@@ -76,6 +76,20 @@ class ArticleOngrDocument
      */
     protected $created;
 
+    /**
+     * @var array
+     *
+     * @Property(type="integer")
+     */
+    protected $categories;
+
+    /**
+     * @var array
+     *
+     * @Property(type="integer")
+     */
+    protected $tags;
+
     /**
      * @param string $uuid
      */
@@ -275,4 +289,52 @@ public function setCreated($created)
 
         return $this;
     }
+
+    /**
+     * Returns categories.
+     *
+     * @return array
+     */
+    public function getCategories()
+    {
+        return $this->categories;
+    }
+
+    /**
+     * Set categories.
+     *
+     * @param array $categories
+     *
+     * @return self
+     */
+    public function setCategories($categories)
+    {
+        $this->categories = $categories;
+
+        return $this;
+    }
+
+    /**
+     * Returns tags.
+     *
+     * @return array
+     */
+    public function getTags()
+    {
+        return $this->tags;
+    }
+
+    /**
+     * Set tags.
+     *
+     * @param array $tags
+     *
+     * @return self
+     */
+    public function setTags($tags)
+    {
+        $this->tags = $tags;
+
+        return $this;
+    }
 }
diff --git a/Document/Index/ArticleIndexer.php b/Document/Index/ArticleIndexer.php
@@ -16,6 +16,7 @@
 use Sulu\Bundle\ArticleBundle\Document\ArticleOngrDocument;
 use Sulu\Bundle\ArticleBundle\Util\TypeTrait;
 use Sulu\Bundle\SecurityBundle\UserManager\UserManager;
+use Sulu\Bundle\TagBundle\Tag\TagManagerInterface;
 use Sulu\Component\Content\Compat\StructureManagerInterface;
 
 /**
@@ -40,16 +41,27 @@ class ArticleIndexer implements IndexerInterface
      */
     private $manager;
 
+    /**
+     * @var TagManagerInterface
+     */
+    private $tagManager;
+
     /**
      * @param StructureManagerInterface $structureManager
      * @param UserManager $userManager
      * @param Manager $manager
+     * @param TagManagerInterface $tagManager
      */
-    public function __construct(StructureManagerInterface $structureManager, UserManager $userManager, Manager $manager)
-    {
+    public function __construct(
+        StructureManagerInterface $structureManager,
+        UserManager $userManager,
+        Manager $manager,
+        TagManagerInterface $tagManager
+    ) {
         $this->structureManager = $structureManager;
         $this->userManager = $userManager;
         $this->manager = $manager;
+        $this->tagManager = $tagManager;
     }
 
     /**
@@ -79,6 +91,10 @@ public function index(ArticleDocument $document)
         $article->setCreator($this->userManager->getFullNameByUserId($document->getCreator()));
         $article->setType($this->getType($structure->getStructure()));
 
+        $excerpt = $document->getExtensionsData()->toArray()['excerpt'];
+        $article->setCategories($excerpt['categories']);
+        $article->setTags($this->tagManager->resolveTagNames($excerpt['tags']));
+
         $this->manager->persist($article);
     }
 

diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -30,6 +30,7 @@
             <argument type="service" id="sulu.content.structure_manager"/>
             <argument type="service" id="sulu_security.user_manager"/>
             <argument type="service" id="es.manager"/>
+            <argument type="service" id="sulu_tag.tag_manager"/>
         </service>
 
         <!-- document -->

diff --git a/Resources/public/dist/components/articles/edit/excerpt/main.js b/Resources/public/dist/components/articles/edit/excerpt/main.js
diff --git a/Resources/public/dist/components/articles/edit/seo/main.js b/Resources/public/dist/components/articles/edit/seo/main.js
diff --git a/Resources/public/js/components/articles/edit/excerpt/main.js b/Resources/public/js/components/articles/edit/excerpt/main.js
@@ -18,7 +18,7 @@ define([], function() {
             var content = this.options.data();
             content.ext.excerpt = data;
 
-            this.sandbox.emit('sulu.articles.save', data, action);
+            this.sandbox.emit('sulu.articles.save', content, action);
         }
     };
 });
diff --git a/Resources/public/js/components/articles/edit/seo/main.js b/Resources/public/js/components/articles/edit/seo/main.js
@@ -29,7 +29,7 @@ define(function() {
             var content = this.options.data();
             content.ext.seo = data;
 
-            this.sandbox.emit('sulu.articles.save', data, action);
+            this.sandbox.emit('sulu.articles.save', content, action);
         }
     };
 });