Merge branch 'master' into dist/eole/2.8.0/master

This commit is contained in:
Daniel Dehennin 2020-10-15 09:10:44 +02:00
commit c7d4949fb7
1 changed files with 10 additions and 3 deletions

View File

@ -32,9 +32,16 @@
<param name='default_mismatch'>ldap</param> <param name='default_mismatch'>ldap</param>
</auto> </auto>
<auto name='calc_val' target='eolesso_adresse'> <fill name='calc_val_first_value' target='eolesso_adresse'>
<param type='eole'>authWebName</param> <param type='eole' optional='True' hidden='False'>authWebName</param>
</auto> <param type='eole' optional='True' hidden='False'>web_url</param>
<param type='eole'>nom_domaine_machine</param>
</fill>
<condition name='frozen_if_in' source='activerLemon'>
<param>oui</param>
<target type='variable'>eolesso_adresse</target>
</condition>
<auto name='calc_val' target='ldapServer'> <auto name='calc_val' target='ldapServer'>
<param type='eole'>adresse_ip_ldap</param> <param type='eole'>adresse_ip_ldap</param>