From 354d8df055a8ea204cb810767d34313d040a4567 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Mon, 8 Jun 2020 12:13:43 +0200
Subject: [PATCH] =?UTF-8?q?optimisation=20sur=20selection=20du=20projet=20?=
 =?UTF-8?q?associ=C3=A9=20=C3=A0=20une=20tache=20(ref=20#138)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PortalBundle/Controller/ProjectController.php |  9 +++++++--
 .../Controller/ProjecttaskController.php          | 15 +++++++++++++--
 .../views/Pagewidget/viewproject.html.twig        |  2 +-
 .../Resources/views/Project/view.html.twig        |  2 +-
 .../Resources/views/Projecttask/view.html.twig    |  2 +-
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjectController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjectController.php
index f8f7aff1..fbdc9164 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjectController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjectController.php
@@ -359,7 +359,11 @@ class ProjectController extends Controller
             if($groups) {
                 if($groups[0]->getFgcanshare()) {
                     $pages=$groups[0]->getPages();
-                    if($pages) $idpage=$pages[0]->getId();
+                    if($pages) {
+                        $idpage=$pages[0]->getId();
+                        $groups=$pages[0]->getGroups();
+                        $idgroup=$groups[0]->getId();
+                    }                        
                 }
             }
         }
@@ -428,7 +432,8 @@ class ProjectController extends Controller
             'countarticles'     => $count,
             'pagination'        => $pagination,
             'page'              => $page,
-            'idpage'            => $idpage
+            'idpage'            => $idpage,
+            'idgroup'           => $idgroup
         ]);
 
     }
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjecttaskController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjecttaskController.php
index da155215..063af716 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjecttaskController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjecttaskController.php
@@ -51,6 +51,11 @@ class ProjecttaskController extends Controller
         $entity->setPriority(0);
         $entity->setPercentage(0);
         $pageid=$request->get("page");
+        if($pageid) {
+            $page=$em->getRepository("CadolesPortalBundle:Page")->find($pageid);
+            $groups=$page->getGroups();
+            $idgroup=$groups[0]->getId();
+        }
         
         $form   = $this->entityForm($entity,$access);
         $form->handleRequest($request);
@@ -82,7 +87,7 @@ class ProjecttaskController extends Controller
             if(is_null($pageid))
                 return $this->redirect($this->generateUrl('cadoles_portal_'.$access.'_projecttask_view',["id"=>$entity->getId()]));          
             else
-                return $this->redirect($this->generateUrl('cadoles_portal_'.$access.'_page_view',["id"=>$pageid]));          
+                return $this->redirect($this->generateUrl('cadoles_portal_'.$access.'_page_view',["id"=>$pageid,"usage"=>"group","group"=>$idgroup]));          
         }
 
         return $this->render($this->labelentity.':edit.html.twig', [
@@ -196,10 +201,15 @@ class ProjecttaskController extends Controller
         // On recherche la premiere page associé au groupe du projet
         $groups=$entity->getProject()->getGroups();
         $idpage=null;
+        $idgroup=null;
         if($groups) {
             if($groups[0]->getFgcanshare()) {
                 $pages=$groups[0]->getPages();
-                if($pages) $idpage=$pages[0]->getId();
+                if($pages) {
+                    $idpage=$pages[0]->getId();
+                    $groups=$pages[0]->getGroups();
+                    $idgroup=$groups[0]->getId();
+                }
             }
         }
 
@@ -297,6 +307,7 @@ class ProjecttaskController extends Controller
             'projecttasks'      => $projecttasks,
             'files'             => $files,
             'idpage'            => $idpage,
+            'idgroup'           => $idgroup,
         ]);
 
     }
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewproject.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewproject.html.twig
index a4f3d5ba..ee875146 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewproject.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewproject.html.twig
@@ -81,7 +81,7 @@
                                                 {{ projecttask.user.username }}
                                             {% endif %}
                                             <br>Crée le {{ projecttask.submit|date("d/m/Y à H:i") }}
-                                            <br>Dans le project {{projecttask.project.name }}
+                                            <br>Dans le projet {{projecttask.project.name }}
                                         </div>
 
                                         <div class="pull-right" style="margin-top:-5px; width:80px; text-align: center;">
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/view.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/view.html.twig
index 19406c6d..94af06d4 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/view.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/view.html.twig
@@ -15,7 +15,7 @@
     
     <div style="margin:10px 0px 10px 0px; text-align:left; display:inline-block;width:49%">
         {% if not idpage is empty %}
-        <a href="{{path('cadoles_portal_user_page_view',{id:idpage})}}" class="btn btn-default">Revenir sur le Groupe</a>
+        <a href="{{path('cadoles_portal_user_page_view',{id:idpage,usage:'group',group:idgroup})}}" class="btn btn-default">Revenir sur le Groupe</a>
         {% endif %}
     </div>
 
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Projecttask/view.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Projecttask/view.html.twig
index 4caa8b84..cbf24be5 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Projecttask/view.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Projecttask/view.html.twig
@@ -37,7 +37,7 @@
     {% else %}
         <div style="margin:10px 0px 10px 0px; text-align:left; display:inline-block;width:49%">
             {% if not idpage is empty %}
-            <a href="{{path('cadoles_portal_user_page_view',{id:idpage})}}" class="btn btn-default">Revenir sur le Groupe</a>
+            <a href="{{path('cadoles_portal_user_page_view',{id:idpage,usage:'group',group:idgroup})}}" class="btn btn-default">Revenir sur le Groupe</a>
             {% endif %}
         </div>