added article status check

academic · Jan 18, 2017 · 044f465 · 044f465
1 parent 00e052f
commit 044f465
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/Ojs/OAIBundle/Controller/DefaultController.php b/src/Ojs/OAIBundle/Controller/DefaultController.php
@@ -219,6 +219,9 @@ public function getRecordAction(Request $request)
             $qb->expr()->eq("a.id",":id")
         )
             ->setParameter("id",$id);
+        $qb->andWhere(
+            $qb->expr()->eq("a.status",ArticleStatuses::STATUS_PUBLISHED)
+        );
         $data['record'] = $qb->getQuery()->getOneOrNullResult();
         if(!$data['record']){
             throw new NotFoundHttpException("Record not found");

diff --git a/src/Ojs/OAIBundle/Controller/JournalController.php b/src/Ojs/OAIBundle/Controller/JournalController.php
@@ -159,7 +159,8 @@ public function listIdentifierAction(Request $request)
         $builder = $em->createQueryBuilder();
         $builder->select('article')->from('OjsJournalBundle:Article', 'article');
         $builder->join('article.journal', 'journal', 'WITH');
-        $builder->where($builder->expr()->eq('journal.slug', ':slug'))->setParameter('slug', $slug);
+        $builder->where($builder->expr()->eq('article.status', ArticleStatuses::STATUS_PUBLISHED));
+        $builder->andWhere($builder->expr()->eq('journal.slug', ':slug'))->setParameter('slug', $slug);
 
         $data = ['records' => $builder->getQuery()->getResult()];
 
@@ -187,6 +188,7 @@ public function getRecordAction(Request $request)
         $builder = $em->createQueryBuilder();
         $builder->select("article")->from("OjsJournalBundle:Article", "article");
         $builder->where($builder->expr()->eq("article.id", ":id"))->setParameter("id", $matches[4][0]);
+        $builder->andWhere($builder->expr()->eq('article.status', ArticleStatuses::STATUS_PUBLISHED));
 
         $data = [];
         $data['metadataPrefix'] = $request->get('metadataPrefix', 'oai_dc');