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 17d2be3c..d32e9ede 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php @@ -130,11 +130,25 @@ class PagewidgetController extends Controller } $entity->setParameter($param); - + $em = $this->getDoctrine()->getManager(); $em->persist($entity); $em->flush(); + + // Notification création widget + $groups=$page->getGroups(); + if($groups) { + if($groups[0]->getFgcanshare()) { + $message="Création Widget ".$entity->getName(); + $usergroup=$em->getRepository("CadolesCoreBundle:Usergroup")->findOneBy(["group"=>$groups[0],"user"=>$this->getUser()]); + if($usergroup) { + $key=$usergroup->getKeyvalue(); + $websocket = $this->container->get('cadoles.websocket.pushmessage')->send($key,$this->getUser()->getId(),$groups[0]->getId(),$message); + } + } + } + if($access=="config") { if($by=="view") return $this->redirect($this->generateUrl('cadoles_portal_config_page_view',["id"=>$idpage])); @@ -267,6 +281,19 @@ class PagewidgetController extends Controller if(!$canupdate) throw $this->createNotFoundException('Permission denied'); } + // Notification création widget + $groups=$entity->getPage()->getGroups(); + if($groups) { + if($groups[0]->getFgcanshare()) { + $message="Suppression Widget ".$entity->getName(); + $usergroup=$em->getRepository("CadolesCoreBundle:Usergroup")->findOneBy(["group"=>$groups[0],"user"=>$this->getUser()]); + if($usergroup) { + $key=$usergroup->getKeyvalue(); + $websocket = $this->container->get('cadoles.websocket.pushmessage')->send($key,$this->getUser()->getId(),$groups[0]->getId(),$message); + } + } + } + // Supression du pagewidget $em->remove($entity); $em->flush(); diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig index 11c4927d..53727cd2 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig @@ -328,7 +328,7 @@ // Suppression d'un widget function delWidget(idwidget) { var txt; - var r = confirm("Confirmez-vous la suppression de ce widget ?"); + var r = confirm("ATTENTION\nConfirmez-vous la suppression de ce widget ?\n\nL'ensemble du contenu sera définitivement perdu !!"); if (r == true) { $.ajax({ method: "POST", 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 ee875146..01341f4d 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 @@ -64,17 +64,17 @@