Fixed a bug where uncategorized questions were breaking the moderatio…

…n interface.
paustian · Feb 2, 2020 · 8b30985 · 8b30985
1 parent c4307a7
commit 8b30985
Showing 1 changed file with 22 additions and 12 deletions.
diff --git a/Controller/AdminController.php b/Controller/AdminController.php
@@ -1253,6 +1253,25 @@ public function cleanCatDupesAction(){
         return $response;
     }
 
+    /**
+     * Add the category name to each question.
+     * @param $questions
+     * @return array
+     */
+
+    private function _categorizeQuestions($questions){
+        $returnQuestions = [];
+        foreach($questions as $question){
+            $cat = $question->getCategories()->first();
+            $name = "Uncategorized";
+            if($cat !== false){
+                $name = $cat->getCategory()->getName();
+            }
+            $returnQuestions[$question->getId()] = $name;
+        }
+        return $returnQuestions;
+    }
+
     /**
      * @Route("/examinemoderated")
      * @return Response
@@ -1276,10 +1295,7 @@ public function examinemoderatedAction(Request $request){
         $query = $qb->getQuery();
         // execute query
         $questions = $query->getResult();
-        $qCategories = [];
-        foreach($questions as $question){
-            $qCategories[$question->getId()] = $question->getCategories()->first()->getCategory()->getName();
-        }
+        $qCategories = $this->_categorizeQuestions($questions);
 
         return $this->render("PaustianQuickcheckModule:Admin:quickcheck_admin_examinequestions.html.twig",
             ['questions' => $questions,
@@ -1308,10 +1324,7 @@ public function examineallAction(Request $request){
         $query = $qb->getQuery();
         // execute query
         $questions = $query->getResult();
-        $qCategories = [];
-        foreach($questions as $question){
-            $qCategories[$question->getId()] = $question->getCategories()->first()->getCategory()->getName();
-        }
+        $qCategories = $this->_categorizeQuestions($questions);
 
         return $this->render("PaustianQuickcheckModule:Admin:quickcheck_admin_examinequestions.html.twig",
             ['questions' => $questions,
@@ -1342,10 +1355,7 @@ public function examinehiddenAction(Request $request){
         $query = $qb->getQuery();
         // execute query
         $questions = $query->getResult();
-        $qCategories = [];
-        foreach($questions as $question){
-            $qCategories[$question->getId()] = $question->getCategories()->first()->getCategory()->getName();
-        }
+        $qCategories = $this->_categorizeQuestions($questions);
 
         return $this->render("PaustianQuickcheckModule:Admin:quickcheck_admin_examinequestions.html.twig",
             ['questions' => $questions,