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 1eb541dd..5a42a942 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php @@ -931,13 +931,17 @@ class GroupController extends Controller $data=$this->getData($id); $this->canManager($data,$access); + // idreturn ? + $idreturn=$request->get("idreturn"); + // Affichage du formulaire return $this->render($this->labelentity.':users.html.twig', [ 'useheader' => true, 'usemenu' => false, 'usesidebar' => ($access=="config"), 'access' => $access, - $this->labeldata => $data + $this->labeldata => $data, + 'idreturn' => $idreturn, ]); } diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/users.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/users.html.twig index 737f38a9..6b2b4789 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/users.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/users.html.twig @@ -3,7 +3,12 @@ {% block pagewrapper %}

Gestion des Utilisateurs

Groupe = {{ group.label }}

- Fermer + {% if idreturn is empty %} + Fermer + {% else %} + Fermer + {% endif %} + {% if moderegistration!="none" and masteridentity=="SQL"%} Inviter des personnes non listées ci-dessous {%endif%} 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 38bd438c..15ab48cd 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php @@ -1889,6 +1889,7 @@ class PagewidgetController extends Controller $em = $this->getDoctrine()->getManager(); $entity = $em->getRepository($this->labelentity)->find($id); if (!$entity) throw $this->createNotFoundException('Unable to find entity.'); + $page=$entity->getPage(); // Permissions if($access=="config") { @@ -1896,7 +1897,6 @@ class PagewidgetController extends Controller } else { // On s'assure que l'utilisateur à la permission de voir - $page=$entity->getPage(); $em->getRepository("CadolesPortalBundle:Page")->getPermission($this->getUser(),$page,$cansee,$canupdate); if(!$cansee) throw $this->createNotFoundException('Permission denied'); } @@ -1942,6 +1942,7 @@ class PagewidgetController extends Controller 'description' => $description, 'members' => $members, 'id' => $id, + 'idpage' => $page->getId(), ]); } @@ -2024,7 +2025,7 @@ class PagewidgetController extends Controller 'canadd' => ($user), 'canupdate' => $canupdate, 'usage' => $usage, - 'groups' => $mygroups, + 'groups' => $mygroups, ]); } diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewinfo.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewinfo.html.twig index c6559304..50d233dc 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewinfo.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewinfo.html.twig @@ -54,7 +54,7 @@ {% if canadd==true %}
- +