From 7f2366545450e2c6060d4e4e5c347421ee471863 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Fri, 8 Nov 2019 16:31:32 +0100
Subject: [PATCH] =?UTF-8?q?indiquer=20en=20sous=20titre=20le=20groupe=20em?=
 =?UTF-8?q?etteur=20du=20message=20avec=20lien=20qui=20permet=20d'y=20acc?=
 =?UTF-8?q?=C3=A9der=20(fixes=20#33)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PortalBundle/Controller/PagewidgetController.php        | 6 +++++-
 .../Resources/views/Pagewidget/viewgroupmessage.html.twig   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
index 193a8d4e..087e2b22 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
@@ -2038,6 +2038,10 @@ class PagewidgetController extends Controller
         $this->getDoctrine()->getRepository("CadolesPortalBundle:Page")->getPagesUser($user,null,$default,$pagesuser,$pagesadmin,$groupsshared);
         if(is_array($groupsshared)) {
             foreach($groupsshared as $groupshared) {
+                // On récupère les info du groupe
+                $title=$groupshared->getLabel();
+                $idpage=$groupshared->pagesshared[0]->getId();
+
                 // On récupère l'ensemble des messages du groupes
                 $messages=$this->getDoctrine()->getRepository("CadolesWebsocketBundle:Message")->findBy(["group"=>$groupshared]);
                 foreach($messages as $key => $message) {
@@ -2051,7 +2055,7 @@ class PagewidgetController extends Controller
                 }
 
                 foreach($messages as $key => $message) {
-                    $tmp=["id" => $message->getId(), "user" => $message->getUser(), "date"=>$message->getSubmitdate(), "topic"=>$message->getTopic()];
+                    $tmp=["id" => $message->getId(), "user" => $message->getUser(), "date"=>$message->getSubmitdate(), "topic"=>$message->getTopic(), "pageid" => $idpage, "pagetitle" => $title];
                     array_push($mymsg,$tmp);   
                 }
             }
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroupmessage.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroupmessage.html.twig
index 8ffb6889..949dda5c 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroupmessage.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroupmessage.html.twig
@@ -82,7 +82,7 @@
                             <div class="caption">
                                 <div class="grid-item-title" style="position:inherit; width:85%">
                                     {{message.user.lastname}} {{message.user.firstname}}<br>
-                                    <small>{{message.date|date('d/m/Y H:i')}}</small><br><br>                            
+                                    <small>{{message.date|date('d/m/Y H:i')}} dans le groupe <u><a href="{{path('cadoles_core_home',{id:message.pageid})}}" target="_top">{{ message.pagetitle }}</a></u></small><br><br>                            
                                     {{ message.topic | raw }}                                                   
                                 </div>   
                             </div>