Commit af8b244d authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Merge branch...

Merge branch '5912-unable-to-spread-a-user-to-fd-from-sinaps-if-the-user-is-affected-to-an-etablissement' into '1.3-fixes'

Resolve "Unable to spread a user to FD from sinaps if the user is affected to an etablissement"

See merge request fusiondirectory/fd-plugins!477
parents e408f0f4 75715470
......@@ -81,9 +81,10 @@ class sinapsRequestAcquisition
/* rattachements */
if (isset($user['supannEntiteAffectationPrincipale'])) {
$personne->rattachements->rattachement->identifiantStructureDeRattachement = $codeEntiteToldapUuidCallback($user['supannEntiteAffectationPrincipale']);
$personne->rattachements->rattachement->roles->role->typeRole = 'EXT';
$personne->rattachements->rattachement->roles->role->externe->typeExterne = $typeExterne;
}
$personne->rattachements->rattachement->roles->role->typeRole = 'EXT';
$personne->rattachements->rattachement->roles->role->externe->typeExterne = $typeExterne;
}
public function getXML()
......
......@@ -73,8 +73,8 @@ class sinapsUser extends simplePlugin
* This is done here to make sure sinapsRequestAcquisition does not perform LDAP searches by itself
* */
$entites = objects::ls(
'entite',
array('supannRefId' => '*', 'supannTypeEntite' => 1, 'dn' => 'raw'),
array('entite','etablissement'),
array('supannRefId' => '*', 'dn' => 'raw'),
NULL,
'(supannCodeEntite='.$codeEntite.')'
);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment