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

Compare commits

base: Cadoles:3f10684027450e3bc66d3f0980c6ca2273681efe
Branches Tags
Cadoles:master
Cadoles:dist/envole/6/master
Cadoles:build/envole/envole-6/unstable
..
compare: Cadoles:8fe100918692156c93e206a7a23be76a32d6254d
Branches Tags
Cadoles:master
Cadoles:dist/envole/6/master
Cadoles:build/envole/envole-6/unstable

No commits in common. "3f10684027450e3bc66d3f0980c6ca2273681efe" and "8fe100918692156c93e206a7a23be76a32d6254d" have entirely different histories.
3f10684027 ... 8fe1009186

1 changed files with 2 additions and 2 deletions
Show Stats 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"?true:false), "disabled" => ($options["mode"]=="delete"||$options["masteridentity"]!="SQL"?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"&&$options["access"]=="config") if($options["masteridentity"]=="LDAP")
{ {
$choices=array("oui" => "1","non" => "0"); $choices=array("oui" => "1","non" => "0");
$builder->add("fgassoc", $builder->add("fgassoc",