Prepare version 2.8.1

* Makefile: Mise à jour de la version. Mise à jour de la release. * .gitignore: règles minimale pour les fichiers de sauvegarde des éditeurs.
eolesso_adresse should be forced only when LemonLDAP::NG is enabled
2020-10-15 09:34:31 +02:00 · 2020-10-15 09:07:40 +02:00
3 changed files with 16 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,4 @@
+# Backup and swap files
+*~
+*#
+*.swp
--- a/4
+++ b/4
@ -3,9 +3,9 @@
 ################################

 SOURCE=eole-lemonldap
-VERSION=2.8.0
+VERSION=2.8
 EOLE_VERSION=2.8
-EOLE_RELEASE=2.8.0
+EOLE_RELEASE=2.8.1
 PKGAPPS=non
 #FLASK_MODULE=<APPLICATION>

--- a/dicos/71_lemonldap_ng_scribe.xml
+++ b/dicos/71_lemonldap_ng_scribe.xml
@ -32,9 +32,16 @@
            <param name='default_mismatch'>ldap</param>
        </auto>

-        <auto name='calc_val' target='eolesso_adresse'>
-            <param type='eole'>authWebName</param>
-        </auto>
+        <fill name='calc_val_first_value' target='eolesso_adresse'>
+            <param type='eole' optional='True' hidden='False'>authWebName</param>
+            <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'>
            <param type='eole'>adresse_ip_ldap</param>