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 cd741c7a..34b216b3 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php @@ -92,12 +92,16 @@ class GroupController extends Controller foreach($datas as $data) { $action = ""; - //if(!$data->getFgall()&&!$data->getFgTemplate()) - $action .="$data->getId()))."'>"; - if($data->getId()>0&&!$data->getFgall()&&!$data->getFgTemplate()&&$this->isGranted('ROLE_ADMIN')) $action.="$data->getId()))."'>"; - if(!$data->getFgall()) $action .="$data->getId()))."'>"; - array_push($output["data"],array($action,$data->getLabel(),($data->getFgopen()?"oui":"non"),($data->getFgcanshare()?"oui":"non"))); + $action .="$data->getId()))."'>"; + if($data->getId()>0&&!$data->getFgall()&&!$data->getFgTemplate()&&$this->isGranted('ROLE_ADMIN')) $action.="$data->getId()))."'>"; + if(!$data->getFgall()) $action .="$data->getId()))."'>"; + + $filtre=""; + if($this->GetParameter("masteridentity")=="LDAP") $filtre=$data->getLdapfilter(); + if($this->GetParameter("masteridentity")=="SSO") $filtre=$data->getAttributes(); + + array_push($output["data"],array($action,$data->getLabel(),($data->getFgopen()?"oui":"non"),($data->getFgcanshare()?"oui":"non"),$filtre)); } // Retour @@ -417,6 +421,7 @@ class GroupController extends Controller { // Initialisation de l'enregistrement $data = new Group(); + $data->setFgopen(false); // Création du formulaire $form = $this->createForm(GroupType::class,$data,array("mode"=>"submit","updatelimite"=>false,"masteridentity"=> $this->GetParameter("masteridentity"))); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig index 9487226c..6f15fec8 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig @@ -15,10 +15,11 @@
Action | +Action | Label | Ouvert | Partage | +Filtre |
---|