diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/RegistrationType.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/RegistrationType.php index b29f2699..1528adc2 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/RegistrationType.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/RegistrationType.php @@ -78,6 +78,9 @@ class RegistrationType extends AbstractType "label" => $session->get('labelniveau01'), 'placeholder' => '== Choisir '.$session->get('labelniveau01').' ==', "choice_label" => "label", + "query_builder"=> function (EntityRepository $er) { + return $er->createQueryBuilder('niveau01')->orderBy('niveau01.label','ASC'); + }, "disabled" => ($options["mode"]=="delete"?true:false), "attr" => array("class" => "form-control", "style" => "margin-bottom:15px","readonly" => ($options["mode"]=="delete"?true:false)))); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/UserType.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/UserType.php index 53f840c6..0f7e42f1 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/UserType.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/UserType.php @@ -89,16 +89,16 @@ class UserType extends AbstractType "query_builder"=> function (EntityRepository $er) use($access,$perm,$userid) { if($access=="config") { if($perm) - return $er->createQueryBuilder('niveau01'); + return $er->createQueryBuilder('niveau01')->orderBy('niveau01.label','ASC'); else { - $result=$er->createQueryBuilder("table")->innerJoin("CadolesCoreBundle:UserModo", "usermodo", Join::WITH, "table.id = usermodo.niveau01"); + $result=$er->createQueryBuilder("table")->innerJoin("CadolesCoreBundle:UserModo", "usermodo", Join::WITH, "table.id = usermodo.niveau01")->orderBy('table.label','ASC'); $result->andWhere("usermodo.user = :userid"); $result->setParameter('userid', $userid); return $result; } } else { - return $er->createQueryBuilder('niveau01'); + return $er->createQueryBuilder('niveau01')->orderBy('niveau01.label','ASC'); } }, "disabled" => ($options["mode"]=="delete"||$options["masteridentity"]!="SQL"?true:false),