diff --git a/src/ninegitea-1.0/src/Controller/ScrumController.php b/src/ninegitea-1.0/src/Controller/ScrumController.php index 0105026..20a8a74 100755 --- a/src/ninegitea-1.0/src/Controller/ScrumController.php +++ b/src/ninegitea-1.0/src/Controller/ScrumController.php @@ -220,7 +220,7 @@ class ScrumController extends AbstractController $em = $this->getDoctrine()->getManager(); $data=$em->getRepository($this->entity)->find($id); if(!$data) return $this->redirectToRoute($this->route); - + $em->getRepository("App:Scrum")->getGitea($data,$giteaassignees,$giteacolumns,$giteamilestones,$giteateams,$giteaprioritys,$giteatypes,$gitealabels); // Préférences utilisateur @@ -251,7 +251,9 @@ class ScrumController extends AbstractController $tbstat[$idmilestone]=["id"=>$idmilestone,"name"=>$lbmilestone,"stat"=>[]]; } - $ordercolumns=array_search($issue->getScrumcolumn()->getGiteaid(),$giteacolumns); + if(!$issue->getScrumcolumn()) $ordercolumns=0; + else $ordercolumns=array_search($issue->getScrumcolumn()->getGiteaid(),$giteacolumns); + //$ordercolumns=$issue->getScrumcolumn()->getId(); if(!array_key_exists($ordercolumns,$tbstat[$idmilestone]["stat"])) { $tbstat[$idmilestone]["stat"][$ordercolumns]=[ @@ -264,7 +266,7 @@ class ScrumController extends AbstractController } foreach($labels as $label) { - if($issue->getScrumcolumn()->getGiteaid()!=$label["id"]) { + if($ordercolumns!=$label["id"]) { if(!array_key_exists($label["id"],$tbstat[$idmilestone]["stat"][$ordercolumns]["labels"])) { $tbstat[$idmilestone]["stat"][$ordercolumns]["labels"][$label["id"]] = [ "id"=>$label["id"],