diff --git a/src/Controller/ScrumController.php b/src/Controller/ScrumController.php index 5ed71c0..cfbb163 100755 --- a/src/Controller/ScrumController.php +++ b/src/Controller/ScrumController.php @@ -179,6 +179,8 @@ class ScrumController extends AbstractController $em = $this->getDoctrine()->getManager(); $data=$em->getRepository($this->entity)->find($id); if(!$data) return $this->redirectToRoute($this->route); + $firstcolumn=$em->getRepository('App:Scrumcolumn')->findOneBy(["scrum"=>$data], ['rowid' => 'ASC']); + if(!$firstcolumn) return $this->redirectToRoute($this->route); $forcereload=false; if($request->get("forcereload")) $forcereload=$request->get("forcereload"); @@ -200,22 +202,22 @@ class ScrumController extends AbstractController if($viewclosed=="false"&&$issue->getGiteastate()=="closed") continue; // Ids - $idcol=$issue->getScrumcolumn()->getId(); + $idcol=($issue->getScrumcolumn()?$issue->getScrumcolumn()->getId():$firstcolumn->getId()); $idjal=($issue->getGiteamilestone()?$issue->getGiteamilestone():-100); $idspr=($issue->getScrumsprint()?$issue->getScrumsprint()->getId():-100); // Roworders - $rowcol=$issue->getScrumcolumn()->getRowid(); + $rowcol=($issue->getScrumcolumn()?$issue->getScrumcolumn()->getRowid():$firstcolumn->getId()); $rowjal=($issue->getGiteaMilestonename()?$issue->getGiteaMilestonename():-100); $rowspr=($issue->getScrumsprint()?$issue->getScrumsprint()->getRowid():-100); // Names - $nmcol=$issue->getScrumcolumn()->getName(); + $nmcol=($issue->getScrumcolumn()?$issue->getScrumcolumn()->getName():$firstcolumn->getId()); $nmjal=($issue->getGiteaMilestonename()?$issue->getGiteaMilestonename():"Aucun"); $nmspr=($issue->getScrumsprint()?$issue->getScrumsprint()->getName():"Aucun"); // Idgiteas - $gicol=$issue->getScrumcolumn()->getGiteaid(); + $gicol=($issue->getScrumcolumn()?$issue->getScrumcolumn()->getGiteaid():$firstcolumn->getId()); $gijal=($issue->getGiteaMilestone()?$issue->getGiteaMilestone():-100); // Liste des colonnes/jalons/sprint avec des issues @@ -601,6 +603,8 @@ class ScrumController extends AbstractController $em = $this->getDoctrine()->getManager(); $data=$em->getRepository($this->entity)->find($id); if(!$data) return $this->redirectToRoute($this->route); + $firstcolumn=$em->getRepository('App:Scrumcolumn')->findOneBy(["scrum"=>$data], ['rowid' => 'ASC']); + if(!$firstcolumn) return $this->redirectToRoute($this->route); $em->getRepository("App:Scrum")->getGitea($data,$giteaassignees,$giteacolumns,$giteamilestones,$giteateams,$giteaprioritys,$giteatypes,$gitealabels); @@ -623,17 +627,17 @@ class ScrumController extends AbstractController if($viewclosed=="false"&&$issue->getGiteastate()=="closed") continue; // Ids - $idcol=$issue->getScrumcolumn()->getId(); + $idcol=($issue->getScrumcolumn()?$issue->getScrumcolumn()->getId():$firstcolumn->getId()); $idjal=($issue->getGiteamilestone()?$issue->getGiteamilestone():-100); $idspr=($issue->getScrumsprint()?$issue->getScrumsprint()->getId():-100); // Roworders - $rowcol=$issue->getScrumcolumn()->getRowid(); + $rowcol=($issue->getScrumcolumn()?$issue->getScrumcolumn()->getRowid():$firstcolumn->getId()); $rowjal=($issue->getGiteaMilestonename()?$issue->getGiteaMilestonename():-100); $rowspr=($issue->getScrumsprint()?$issue->getScrumsprint()->getRowid():-100); // Names - $nmcol=$issue->getScrumcolumn()->getName(); + $nmcol=($issue->getScrumcolumn()?$issue->getScrumcolumn()->getName():$firstcolumn->getId()); $nmjal=($issue->getGiteaMilestonename()?$issue->getGiteaMilestonename():"Aucun"); $nmspr=($issue->getScrumsprint()?$issue->getScrumsprint()->getName():"Aucun");