resolution merge
This commit is contained in:
commit
3f10684027
@ -54,7 +54,7 @@ class GroupType extends AbstractType
|
||||
"query_builder"=> function (EntityRepository $er) {
|
||||
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))
|
||||
]);
|
||||
|
||||
@ -294,7 +294,7 @@ class GroupType extends AbstractType
|
||||
);
|
||||
|
||||
// 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");
|
||||
$builder->add("fgassoc",
|
||||
|
Loading…
Reference in New Issue
Block a user