From 228993dbd6f9272df23e8e1dfee492f876ee3ccf Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 8 Jun 2020 09:01:52 +0200 Subject: [PATCH 01/21] =?UTF-8?q?filtre=20de=20recherche=20sur=20le=20nom?= =?UTF-8?q?=20du=20propri=C3=A9taire=20(ref=20#147)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoreBundle/Controller/GroupController.php | 8 ++++++-- .../Resources/public/themes/transnum/look.png | Bin 27748 -> 27748 bytes .../public/themes/transnum/transnum-logo.png | Bin 27748 -> 27748 bytes 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php index 2176e20e..de1d446f 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php @@ -82,7 +82,9 @@ class GroupController extends Controller $qb=$em->createQueryBuilder(); $qb->select('COUNT(table)') ->from($this->labelentity,'table') + ->leftJoin('CadolesCoreBundle:User', 'u', 'WITH', 'table.owner = u.id') ->where('table.label LIKE :value') + ->orWhere('u.username LIKE :value') ->setParameter("value", "%".$search["value"]."%"); if($access=="user") { $qb->from("CadolesCoreBundle:UserGroup","ug") @@ -107,19 +109,21 @@ class GroupController extends Controller // Parcours des Enregistrement $qb = $em->createQueryBuilder(); - $qb->select('table')->from($this->labelentity,'table'); + $qb ->select('table') + ->from($this->labelentity,'table') + ->leftJoin('CadolesCoreBundle:User', 'u', 'WITH', 'table.owner = u.id'); if($access=="user") { $qb->from("CadolesCoreBundle:UserGroup","ug") ->andWhere(("table.fgcanshare=:flag")) ->andWhere("table.id=ug.group") ->andWhere(":user=ug.user") - ->leftJoin('CadolesCoreBundle:User', 'u', 'WITH', 'table.owner = u.id') ->setParameter("flag", true) ->setParameter("user", $this->getUser()); } if($search["value"]!="") { $qb ->andwhere('table.label LIKE :value') + ->orWhere('u.username LIKE :value') ->setParameter("value", "%".$search["value"]."%"); } switch($order[0]["column"]) { diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/look.png b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/look.png index 8bcffd031afa1a650c7fdfbbb734622a929742c2..aecff8038c7a39cf461b549526afa3123923e8f8 100644 GIT binary patch delta 23 fcmaEIgYn4?#tqj@Iiz`2t>bU9d2POD+GYj-fO-kg delta 23 fcmaEIgYn4?#tqj@Irw>1<@YR93f_Frw9O0vfkg@O diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/transnum-logo.png b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/transnum-logo.png index 8bcffd031afa1a650c7fdfbbb734622a929742c2..aecff8038c7a39cf461b549526afa3123923e8f8 100644 GIT binary patch delta 23 fcmaEIgYn4?#tqj@Iiz`2t>bU9d2POD+GYj-fO-kg delta 23 fcmaEIgYn4?#tqj@Irw>1<@YR93f_Frw9O0vfkg@O From 920e6d66d32999423048162b46fb508bc9d9086f Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 8 Jun 2020 09:07:16 +0200 Subject: [PATCH 02/21] =?UTF-8?q?permettre=20au=20propri=C3=A9taire=20du?= =?UTF-8?q?=20groupe=20de=20changer=20le=20propri=C3=A9taire=20(ref=20#146?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/Cadoles/CoreBundle/Form/GroupType.php | 42 +++++++++---------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/GroupType.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/GroupType.php index e898bed0..7ed00e06 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/GroupType.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/GroupType.php @@ -58,28 +58,26 @@ class GroupType extends AbstractType "attr" => array("class" => "form-control", "style" => "margin-bottom:15px","readonly" => ($options["mode"]=="delete"?true:false)) ]); - if($options["access"]=="config") { - $builder->add('owner', - Select2EntityType::class, array( - 'label' => "Propriétaire", - 'disabled' => ($options["mode"]=="delete"?true:false), - "required" => false, - 'multiple' => false, - 'remote_route' => 'cadoles_core_config_user_ajax_selectlist', - 'class' => 'Cadoles\coreBundle\Entity\User', - 'primary_key' => 'id', - 'text_property' => 'username', - 'minimum_input_length' => 2, - 'page_limit' => 10, - 'allow_clear' => true, - 'delay' => 250, - 'cache' => false, - 'cache_timeout' => 60000, // if 'cache' is true - 'language' => 'fr', - 'placeholder' => 'Selectionner un propriétaire', - 'attr' => array("class" => "form-control", "style" => "margin-bottom:15px") - )); - } + $builder->add('owner', + Select2EntityType::class, array( + 'label' => "Propriétaire", + 'disabled' => ($options["mode"]=="delete"?true:false), + "required" => false, + 'multiple' => false, + 'remote_route' => 'cadoles_core_config_user_ajax_selectlist', + 'class' => 'Cadoles\coreBundle\Entity\User', + 'primary_key' => 'id', + 'text_property' => 'username', + 'minimum_input_length' => 2, + 'page_limit' => 10, + 'allow_clear' => true, + 'delay' => 250, + 'cache' => false, + 'cache_timeout' => 60000, // if 'cache' is true + 'language' => 'fr', + 'placeholder' => 'Selectionner un propriétaire', + 'attr' => array("class" => "form-control", "style" => "margin-bottom:15px") + )); } if($options["access"]=="config") { From 7eae2ee972d902d3e3efc1b72d73a77d4197b1ce Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 8 Jun 2020 09:16:26 +0200 Subject: [PATCH 03/21] =?UTF-8?q?formattage=20de=20la=20l=C3=A9gende=20du?= =?UTF-8?q?=20login=20correcte=20(ref=20#132)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoreBundle/Resources/views/Registration/edit.html.twig | 4 ++-- .../Cadoles/CoreBundle/Resources/views/User/edit.html.twig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Registration/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Registration/edit.html.twig index 61aac292..53ca6ac7 100755 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Registration/edit.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Registration/edit.html.twig @@ -68,8 +68,8 @@
Caractères interdits = accent, espace, caractères spéciaux sauf @ . - _
- Taille minimum = {{keyterm}} caractères - Doit être constitué de chiffres, de lettres et caractères spéciaux + Taille minimum = 5 caractères
+ Formatez votre login sous la forme prenom.nom dans la mesure du possible
{% if form.password is defined %} diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/edit.html.twig index ad422948..16be8812 100755 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/edit.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/edit.html.twig @@ -75,8 +75,8 @@
Caractères interdits = accent, espace, caractères spéciaux sauf @ . - _
- Taille minimum = {{keyterm}} caractères - Doit être constitué de chiffres, de lettres et caractères spéciaux + Taille minimum = 5 caractères
+ Formatez votre login sous la forme prenom.nom dans la mesure du possible
{% if form.password is defined %} From a2c17379e40b32e86e1ee74ecb17290bee1f4982 Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 8 Jun 2020 09:52:16 +0200 Subject: [PATCH 04/21] date de fin sous forme calendrier (ref #153) --- .../src/Cadoles/PortalBundle/Form/ProjecttaskType.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ProjecttaskType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ProjecttaskType.php index 3c8b0737..c7125fd4 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ProjecttaskType.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ProjecttaskType.php @@ -49,6 +49,7 @@ class ProjecttaskType extends AbstractType ->add('end', DateType::class, [ "label" => 'A Réaliser avant le', "required" => false, + "widget" => 'single_text', ]) ->add('percentage', IntegerType::class, [ From eac7f6309462d0416b99d8cab8df7e7002c1489d Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 8 Jun 2020 10:55:27 +0200 Subject: [PATCH 05/21] navigation projet pour retour vers le groupe (ref #152) --- .../Controller/ProjectController.php | 15 +++++++++++- .../Controller/ProjecttaskController.php | 24 +++++++++++++++---- .../views/Pagewidget/viewproject.html.twig | 12 +++++----- .../Resources/views/Project/view.html.twig | 8 ++++++- .../views/Projecttask/edit.html.twig | 6 ++++- .../views/Projecttask/view.html.twig | 7 +++++- 6 files changed, 58 insertions(+), 14 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 51918b4a..f8f7aff1 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjectController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjectController.php @@ -352,6 +352,18 @@ class ProjectController extends Controller if (!$entity) throw $this->createNotFoundException('Unable to find entity.'); } + // On recherche la premiere page associé au groupe du projet + $idpage=null; + if($id!=0) { + $groups=$entity->getGroups(); + if($groups) { + if($groups[0]->getFgcanshare()) { + $pages=$groups[0]->getPages(); + if($pages) $idpage=$pages[0]->getId(); + } + } + } + // Permissions $user=$this->getUser(); if($access=="config") { @@ -415,7 +427,8 @@ class ProjectController extends Controller 'projects' => $projects, 'countarticles' => $count, 'pagination' => $pagination, - 'page' => $page + 'page' => $page, + 'idpage' => $idpage ]); } 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 d966ae55..c4046d9b 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjecttaskController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjecttaskController.php @@ -48,7 +48,8 @@ class ProjecttaskController extends Controller if($project) $entity->setProject($project); $entity->setPriority(0); $entity->setPercentage(0); - + $pageid=$request->get("page"); + $form = $this->entityForm($entity,$access); $form->handleRequest($request); @@ -76,7 +77,10 @@ class ProjecttaskController extends Controller } } - return $this->redirect($this->generateUrl('cadoles_portal_'.$access.'_projecttask_view',["id"=>$entity->getId()])); + 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->render($this->labelentity.':edit.html.twig', [ @@ -87,7 +91,8 @@ class ProjecttaskController extends Controller 'entity' => $entity, 'mode' => "submit", 'access' => $access, - 'form' => $form->createView() + 'form' => $form->createView(), + 'pageid' => $pageid ]); } @@ -186,6 +191,16 @@ class ProjecttaskController extends Controller $entity = $em->getRepository($this->labelentity)->find($id); if (!$entity) throw $this->createNotFoundException('Unable to find entity.'); + // On recherche la premiere page associé au groupe du projet + $groups=$entity->getProject()->getGroups(); + $idpage=null; + if($groups) { + if($groups[0]->getFgcanshare()) { + $pages=$groups[0]->getPages(); + if($pages) $idpage=$pages[0]->getId(); + } + } + // Permissions $user=$this->getUser(); if($access=="config") { @@ -278,7 +293,8 @@ class ProjecttaskController extends Controller 'canadd' => $canadd, 'projects' => $projects, 'projecttasks' => $projecttasks, - 'files' => $files + 'files' => $files, + 'idpage' => $idpage, ]); } 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 90edb129..a4f3d5ba 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 @@ -21,19 +21,19 @@
{% if canupdate %} - - + + {% endif %} {% if access=="config" %} {% else %} {% set idproject = "" %} - {% set url= path('cadoles_portal_user_project_view') %} + {% set url= path('cadoles_portal_user_projecttask_submit') %} {% if usage=="group" and firstproject is defined %} - {% set url= path('cadoles_portal_user_project_view',{id:firstproject}) %} + {% set url= path('cadoles_portal_user_projecttask_submit',{idproject:firstproject,page:entity.page.id}) %} {% endif %} - + {% endif %}
@@ -61,7 +61,7 @@ {% set colortask = projecttask.projecttasktag.color %} {% endif %}
- +
{% endif %} + +
+ {% if not idpage is empty %} + Revenir sur le Groupe + {% endif %} +
-
+
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Projecttask/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Projecttask/edit.html.twig index 25c4df84..82953a6c 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Projecttask/edit.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Projecttask/edit.html.twig @@ -19,7 +19,11 @@ {% set projectid=entity.project.id %} {%endif%} - Annuler + {% if pageid is empty %} + Annuler + {% else %} + Annuler + {% endif %} {% endif %} {% if mode=="update" %} 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 7a65c2c2..4caa8b84 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 @@ -35,7 +35,12 @@ {{ entity.project.name }}
{% else %} -
+
+ {% if not idpage is empty %} + Revenir sur le Groupe + {% endif %} +
+
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 @@ 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 %}
{% if not idpage is empty %} - Revenir sur le Groupe + Revenir sur le Groupe {% endif %}
From 28f84e24603ab5978296cdd40f66dac324937dff Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 8 Jun 2020 15:21:31 +0200 Subject: [PATCH 08/21] notification ajout suppression widget (ref #131) --- .../Controller/PagewidgetController.php | 29 +++++++++++++++- .../Resources/views/Page/viewwidget.html.twig | 2 +- .../views/Pagewidget/viewproject.html.twig | 33 +++++++++---------- 3 files changed, 45 insertions(+), 19 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 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 @@
- -
+ +
+

{{projecttask.name}}

-

{{projecttask.name}}

-
Affectée à +
Affectée à {% if projecttask.user is empty %} {{ projecttask.owner.username }} {% else %} @@ -84,13 +84,7 @@
Dans le projet {{projecttask.project.name }}
-
-
- {{ projecttask.percentage }}% -
-
- -
+
Priorité = {{ projecttask.priority }}
Avant le = {{ projecttask.end|date("d/m/Y") }}
{% if projecttask.projecttasktag %} @@ -100,6 +94,11 @@ Statut = {{ projecttask.projecttaskstatus.name }}
{% endif %}
+
+
+ {{ projecttask.percentage }}% +
+
From dc13f8a3883d11fe52e6534273ca4cf628b013e1 Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 8 Jun 2020 16:07:39 +0200 Subject: [PATCH 09/21] ajout de tooltip sur l'ensemble des boutons widgets (ref #148) --- .../PortalBundle/Controller/PagewidgetController.php | 4 ++-- .../Resources/views/Pagewidget/viewalert.html.twig | 4 ++-- .../views/Pagewidget/viewappexternal.html.twig | 4 ++-- .../Resources/views/Pagewidget/viewblog.html.twig | 8 ++++---- .../views/Pagewidget/viewbookmark.html.twig | 8 ++++---- .../views/Pagewidget/viewcalendar.html.twig | 8 ++++---- .../Resources/views/Pagewidget/viewchat.html.twig | 4 ++-- .../Resources/views/Pagewidget/vieweditor.html.twig | 4 ++-- .../Resources/views/Pagewidget/viewfile.html.twig | 10 +++++----- .../Resources/views/Pagewidget/viewflux.html.twig | 4 ++-- .../Resources/views/Pagewidget/viewframe.html.twig | 4 ++-- .../Resources/views/Pagewidget/viewgalery.html.twig | 10 +++++----- .../Resources/views/Pagewidget/viewgroup.html.twig | 10 +++++----- .../views/Pagewidget/viewgroupmessage.html.twig | 4 ++-- .../Resources/views/Pagewidget/viewinfo.html.twig | 4 ++-- .../Resources/views/Pagewidget/viewitem.html.twig | 12 ++++++------ .../views/Pagewidget/viewitemessential.html.twig | 10 +++++----- .../Resources/views/Pagewidget/viewlink.html.twig | 4 ++-- .../Resources/views/Pagewidget/viewonlydoc.html.twig | 4 ++-- .../views/Pagewidget/viewseparator.html.twig | 4 ++-- .../Resources/views/Pagewidget/viewslide.html.twig | 6 +++--- .../Resources/views/Pagewidget/viewurl.html.twig | 4 ++-- 22 files changed, 67 insertions(+), 67 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 d32e9ede..ac6abe8f 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php @@ -138,7 +138,7 @@ class PagewidgetController extends Controller // Notification création widget $groups=$page->getGroups(); - if($groups) { + if($groups[0]) { if($groups[0]->getFgcanshare()) { $message="Création Widget ".$entity->getName(); $usergroup=$em->getRepository("CadolesCoreBundle:Usergroup")->findOneBy(["group"=>$groups[0],"user"=>$this->getUser()]); @@ -283,7 +283,7 @@ class PagewidgetController extends Controller // Notification création widget $groups=$entity->getPage()->getGroups(); - if($groups) { + if($groups[0]) { if($groups[0]->getFgcanshare()) { $message="Suppression Widget ".$entity->getName(); $usergroup=$em->getRepository("CadolesCoreBundle:Usergroup")->findOneBy(["group"=>$groups[0],"user"=>$this->getUser()]); diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewalert.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewalert.html.twig index 9cdfa329..460f8d3f 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewalert.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewalert.html.twig @@ -15,8 +15,8 @@
{% if canupdate %}
- - + +
{% endif %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig index f788e321..2bef057b 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig @@ -30,8 +30,8 @@ {% if canupdate or canadd %}
{% if canupdate %} - - + + {% endif %}
{% endif %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig index 80fa0fc6..28c84cd9 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig @@ -21,19 +21,19 @@
{% if canupdate %} - - + + {% endif %} {% if access=="config" %} - + {% else %} {% set idblog = "" %} {% set url= path('cadoles_portal_user_blog_view') %} {% if usage=="group" and firstblog is defined %} {% set url= path('cadoles_portal_user_blog_view',{id:firstblog}) %} {% endif %} - + {% endif %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig index 7796af53..315146b2 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig @@ -37,12 +37,12 @@ {% if canupdate or canadd %}
{% if canupdate %} - - + + {% endif %} {% if canadd %} - + {% endif %}
{% endif %} @@ -99,7 +99,7 @@ {% if canadd %}
-
+