Merge branch 'master' into dist/envole/6/master
This commit is contained in:
commit
d42fdbfedd
|
@ -142,6 +142,19 @@ class SynchroCommand extends Command
|
|||
$this->writeln(" - $label");
|
||||
if(!$simulate) $this->addmodGroup($label,$ldapfilter,$scribe_group);
|
||||
|
||||
// Niveaux
|
||||
$this->writeln('');
|
||||
$this->writeln('== NIVEAUX ==========================================');
|
||||
$results = $this->ldap->search("type=Niveau", ['cn','description','gidNumber'], $this->ldap_basedn);
|
||||
foreach($results as $result) {
|
||||
$cn=$result["cn"];
|
||||
$ldapfilter="(&(type=Niveau)(cn=$cn))";
|
||||
|
||||
$label="NIVEAU - ".$result["cn"];
|
||||
$this->writeln(" - $label");
|
||||
if(!$simulate) $this->addmodGroup($label,$ldapfilter,false);
|
||||
}
|
||||
|
||||
// Classes
|
||||
$this->writeln('');
|
||||
$this->writeln('== CLASSES ==========================================');
|
||||
|
@ -155,6 +168,32 @@ class SynchroCommand extends Command
|
|||
if(!$simulate) $this->addmodGroup($label,$ldapfilter,$scribe_group);
|
||||
}
|
||||
|
||||
// Elèves des Classes
|
||||
$this->writeln('');
|
||||
$this->writeln('== ELEVES DES CLASSES ==========================================');
|
||||
$results = $this->ldap->search("type=Classe", ['cn','description','gidNumber'], $this->ldap_basedn);
|
||||
foreach($results as $result) {
|
||||
$cn=$result["cn"];
|
||||
$ldapfilter="(&(type=Classe)(cn=$cn))";
|
||||
|
||||
$label="ELEVES - ".$result["cn"];
|
||||
$this->writeln(" - $label");
|
||||
if(!$simulate) $this->addmodGroup($label,$ldapfilter,false);
|
||||
}
|
||||
|
||||
// Professeurs des Classes
|
||||
$this->writeln('');
|
||||
$this->writeln('== PROFESSEURS DES CLASSES ==========================================');
|
||||
$results = $this->ldap->search("type=Classe", ['cn','description','gidNumber'], $this->ldap_basedn);
|
||||
foreach($results as $result) {
|
||||
$cn=$result["cn"];
|
||||
$ldapfilter="(|(&(type=Equipe)(cn=profs-$cn))(&(ENTPersonProfils=Administratif)(divcod=$cn)))";
|
||||
|
||||
$label="PROFESSEURS - ".$result["cn"];
|
||||
$this->writeln(" - $label");
|
||||
if(!$simulate) $this->addmodGroup($label,$ldapfilter,false);
|
||||
}
|
||||
|
||||
// Options
|
||||
$this->writeln('');
|
||||
$this->writeln('== OPTIONS ==========================================');
|
||||
|
|
|
@ -124,7 +124,7 @@ class ItemController extends Controller
|
|||
"labelniveau01" => $this->GetParameter("labelsniveau01"),
|
||||
"ssosynchroitem" => $this->GetParameter("ssosynchroitem"),
|
||||
"user_attr_cas_item" => $this->GetParameter("user_attr_cas_item"),
|
||||
"activate_widsonde" => $this->GetParameter("activate_widsonde"),
|
||||
"activate_widsonde" => ($this->GetParameter("activate_widsonde")&&$data->getId()>0),
|
||||
));
|
||||
|
||||
// Récupération des data du formulaire
|
||||
|
|
|
@ -151,13 +151,13 @@ class ItemType extends AbstractType
|
|||
if($options["activate_widsonde"]) {
|
||||
$builder
|
||||
->add('clicksonde', CheckboxType::class, [
|
||||
"label" => "Exécuter une sonde statistique sur le click",
|
||||
"label" => "Exécuter une sonde statistique sur le clic",
|
||||
"required" => false
|
||||
])
|
||||
|
||||
->add('clicksondeservice', ChoiceType::class, [
|
||||
"label" => 'Type de Service associé à la sonde',
|
||||
"placeholder" => 'Selectionner un service',
|
||||
"placeholder" => 'Sélectionner un service',
|
||||
"required" => false,
|
||||
"choices" => [
|
||||
"ACCUEIL" => "ACCUEIL",
|
||||
|
|
Loading…
Reference in New Issue