From 57606ce0d5cf4ea38f63825b7cf54f9e82a830b5 Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 15 Mar 2021 16:55:15 +0100 Subject: [PATCH] =?UTF-8?q?retour=20de=20l'icone=20de=20d=C3=A9scription?= =?UTF-8?q?=20des=20groupes=20ouvert=20(ref=20#235)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/Cadoles/CoreBundle/Controller/GroupController.php | 2 +- .../Cadoles/CoreBundle/Resources/views/User/edit.html.twig | 6 ++++-- 2 files changed, 5 insertions(+), 3 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 a457af1e..fe0e6143 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php @@ -194,7 +194,7 @@ class GroupController extends Controller $action .="$data->getId()))."'>"; } else { - $action.="$data->getId()))."'>"; + $action.="$data->getId()))."'>"; } if($data->getFgcanshare()) 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 c81036aa..9dbd9c88 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 @@ -172,9 +172,11 @@ {% if access=="config" and not group.group.fgall and group.group.ldapfilter=="" and group.group.attributes =="" %} {% elseif (group.group.fgopen or group.group.fgcanshare) and group.group.owner!=app.user and not group.group.fgall and group.group.ldapfilter=="" and group.group.attributes =="" %} - + {% else %} - + + {{ group.group.id }} + {% endif %}