fix comments ussage after change for thread property

sourcefabric · Apr 12, 2015 · f71d3a2 · f71d3a2
1 parent b5616a0
commit f71d3a2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 40 deletions.
diff --git a/newscoop/library/Newscoop/Entity/Comment.php b/newscoop/library/Newscoop/Entity/Comment.php
@@ -88,15 +88,6 @@ class Comment implements DocumentInterface
      */
     protected $thread;
 
-    /**
-     * @ORM\ManyToOne(targetEntity="Newscoop\Entity\Article")
-     * @ORM\JoinColumns({
-     *      @ORM\JoinColumn(name="fk_thread_id", referencedColumnName="Number"),
-     *      @ORM\JoinColumn(name="fk_language_id", referencedColumnName="IdLanguage")
-     *  })
-     */
-    protected $article;
-
     /**
      * @ORM\ManyToOne(targetEntity="Newscoop\Entity\Language")
      * @ORM\JoinColumn(name="fk_language_id", referencedColumnName="Id")
@@ -212,29 +203,6 @@ public function getId()
         return $this->id;
     }
 
-    /**
-     * Set article
-     *
-     * @param  Newscoop\Entity\Article $article
-     * @return void
-     */
-    public function setArticle(Article $article)
-    {
-        $this->article = $article;
-
-        return $this;
-    }
-
-    /**
-     * Get article
-     *
-     * @return Newscoop\Entity\Article
-     */
-    public function getArticle()
-    {
-        return $this->article;
-    }
-
     /**
      * Set timecreated
      *
@@ -507,7 +475,7 @@ public function getForum()
      *
      * @return Newscoop\Entity\Comment
      */
-    public function setThread(Article $thread)
+    public function setThread($thread)
     {
         $this->thread = $thread;
 
@@ -517,7 +485,7 @@ public function setThread(Article $thread)
     /**
      * Get thread
      *
-     * @return Newscoop\Entity\Articles
+     * @return int
      */
     public function getThread()
     {

diff --git a/newscoop/library/Newscoop/Entity/Repository/CommentRepository.php b/newscoop/library/Newscoop/Entity/Repository/CommentRepository.php
@@ -305,7 +305,7 @@ public function save(Comment $entity, $values)
                     ->andWhere('c.thread = :thread')
                     ->andWhere('c.language = :language')
                     ->setParameter('parent', $parent)
-                    ->setParameter('thread', $parent->getThread()->getId())
+                    ->setParameter('thread', $parent->getThread())
                     ->setParameter('language', $parent->getLanguage()->getId());
 
             $threadOrder = $threadOrder->getQuery()->getSingleScalarResult();
@@ -325,7 +325,7 @@ public function save(Comment $entity, $values)
                ->andWhere('c.thread = :thread')
                ->andWhere('c.language = :language')
                     ->setParameter('language', $parent->getLanguage()->getId())
-                    ->setParameter('thread', $parent->getThread()->getId())
+                    ->setParameter('thread', $parent->getThread())
                     ->setParameter('thread_order', $threadOrder);
             $qb->getQuery()->execute();
             // set the thread level the thread level of the parent plus one the current level
@@ -356,7 +356,7 @@ public function save(Comment $entity, $values)
             $entity
                 ->setLanguage($language)
                 ->setForum($thread->getPublication())
-                ->setThread($thread);
+                ->setThread($thread->getNumber());
         }
 
         $entity->setThreadOrder($threadOrder)->setThreadLevel($threadLevel);

diff --git a/newscoop/library/Newscoop/Services/CommentNotificationService.php b/newscoop/library/Newscoop/Services/CommentNotificationService.php
@@ -51,7 +51,7 @@ public function update(GenericEvent $event)
     {
         $comment = $this->commentService->find($event['id']);
         $article = $this->em->getRepository('Newscoop\Entity\Article')
-            ->getArticle($comment->getThread()->getNumber(), $comment->getLanguage()->getId())
+            ->getArticle($comment->getThread(), $comment->getLanguage()->getId())
             ->getSingleResult();
 
         try {
@@ -60,7 +60,7 @@ public function update(GenericEvent $event)
             $user = null;
         }
 
-        $authors = \ArticleAuthor::GetAuthorsByArticle($comment->getThread()->getNumber(), $comment->getLanguage()->getId());
+        $authors = \ArticleAuthor::GetAuthorsByArticle($comment->getThread(), $comment->getLanguage()->getId());
         $this->emailService->sendCommentNotification($comment, $article, $authors, $user);
     }
 }
diff --git a/newscoop/template_engine/classes/CampURIShortNames.php b/newscoop/template_engine/classes/CampURIShortNames.php
@@ -274,7 +274,8 @@ private function _getLanguage($code, MetaPublication $publication)
     /**
      * Get issue
      *
-     * @param  string    $name
+     * @param  string $name
+     *
      * @return MetaIssue
      */
     private function _getIssue($name, MetaLanguage $language, MetaPublication $publication)