fixed filtering by topic

sourcefabric · Jan 20, 2015 · 3fff3ef · 3fff3ef
1 parent 56ff91a
commit 3fff3ef
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/newscoop/classes/Article.php b/newscoop/classes/Article.php
@@ -2574,22 +2574,19 @@ public static function GetList(array $p_parameters, $p_order = null,
             } elseif ($leftOperand == 'matchalltopics') {
                 // set the matchAllTopics flag
                 $matchAllTopics = true;
-            } elseif ($leftOperand == 'topic') {
+            } elseif ($leftOperand == 'topic' || $leftOperand == 'topic_strict') {
                 // add the topic to the list of match/do not match topics depending
                 // on the operator
-                $topic = new Topic($comparisonOperation['right']);
-                if ($topic->exists()) {
-                    $topicIds = $topic->getSubtopics(true, 0);
-                    $topicIds[] = $comparisonOperation['right'];
-                    if ($comparisonOperation['symbol'] == '=') {
-                        $hasTopics[] = $topicIds;
-                    } else {
-                        $hasNotTopics[] = $topicIds;
+                $em = Zend_Registry::get('container')->getService('em');
+                $request = Zend_Registry::get('container')->getService('request');
+                $repository = $em->getRepository('Newscoop\NewscoopBundle\Entity\Topic');
+                $topic = $repository->getTopicByIdOrName($comparisonOperation['right'], $request->getLocale())->getOneOrNullResult();
+                if ($topic) {
+                    $topicIds = array();
+                    foreach($topic->getChildren() as $child) {
+                        $topicIds[] = $child->getId();
                     }
-                }
-            } elseif ($leftOperand == 'topic_strict') {
-                $topic = new Topic($comparisonOperation['right']);
-                if ($topic->exists()) {
+
                     $topicIds[] = $comparisonOperation['right'];
                     if ($comparisonOperation['symbol'] == '=') {
                         $hasTopics[] = $topicIds;

diff --git a/newscoop/src/Newscoop/NewscoopBundle/Controller/TopicsController.php b/newscoop/src/Newscoop/NewscoopBundle/Controller/TopicsController.php
@@ -29,17 +29,17 @@ class TopicsController extends Controller
      */
     public function getTopicsAction(Request $request)
     {
-
         $term = $request->query->get('term', '');
         $limit = $request->query->get('limit', null);
 
         if (trim($term) === '') {
             return new JsonResponse(array());
         }
 
+        $locale = $request->get('_code', $request->getLocale());
         $topics = $this->container->get('em')
             ->getRepository('Newscoop\NewscoopBundle\Entity\Topic')
-            ->searchTopics($term, array('title' => 'asc'), $limit)
+            ->searchTopics($term, array('title' => 'asc'), $limit, $locale)
             ->getArrayResult();
 
         return new JsonResponse($topics);

diff --git a/newscoop/src/Newscoop/NewscoopBundle/Entity/Repository/TopicRepository.php b/newscoop/src/Newscoop/NewscoopBundle/Entity/Repository/TopicRepository.php
@@ -218,7 +218,7 @@ public function getArticlesQueryByTopicIdAndLanguage($topicId, $languageCode, $d
      *
      * @return Query
      */
-    public function searchTopics($query, $sort = array(), $limit = null)
+    public function searchTopics($query, $sort = array(), $limit = null, $locale = null)
     {
         $meta = $this->getClassMetadata();
         $config = $this->listener->getConfiguration($this->_em, $meta->name);
@@ -244,7 +244,7 @@ public function searchTopics($query, $sort = array(), $limit = null)
             $qb->setMaxResults($limit);
         }
 
-        return $this->setTranslatableHint($qb->getQuery());
+        return $this->setTranslatableHint($qb->getQuery(), $locale);
     }
 
     /**