Cadoles
/
ninegate
20
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

resolution merge

This commit is contained in:
Arnaud Fornerot 2020-05-15 15:52:05 +02:00
parent 8fe1009186 866b7ada81
commit 3f10684027
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ninegate-1.0/src/Cadoles/CoreBundle/Form/GroupType.php
View File

@ -54,7 +54,7 @@ class GroupType extends AbstractType
"query_builder"=> function (EntityRepository $er) { "query_builder"=> function (EntityRepository $er) {
return $er->createQueryBuilder('page')->where('page.parentfor=:parentfor')->setParameter('parentfor', 'group'); return $er->createQueryBuilder('page')->where('page.parentfor=:parentfor')->setParameter('parentfor', 'group');
}, },
"disabled" => ($options["mode"]=="delete"||$options["masteridentity"]!="SQL"?true:false), "disabled" => ($options["mode"]=="delete"?true:false),
"attr" => array("class" => "form-control", "style" => "margin-bottom:15px","readonly" => ($options["mode"]=="delete"?true:false)) "attr" => array("class" => "form-control", "style" => "margin-bottom:15px","readonly" => ($options["mode"]=="delete"?true:false))
]); ]);
@ -294,7 +294,7 @@ class GroupType extends AbstractType
); );
// Si masteridentity = LDAP alors on demande le filtre des utilisateurs qui appartiennent à ce groupe // Si masteridentity = LDAP alors on demande le filtre des utilisateurs qui appartiennent à ce groupe
if($options["masteridentity"]=="LDAP") if($options["masteridentity"]=="LDAP"&&$options["access"]=="config")
{ {
$choices=array("oui" => "1","non" => "0"); $choices=array("oui" => "1","non" => "0");
$builder->add("fgassoc", $builder->add("fgassoc",