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 · 2020-10-14 15:54:41 +02:00 · 2020-10-14 15:46:39 +02:00
3 changed files with 24 additions and 3 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
@ -3,7 +3,13 @@

    <files />

-    <variables />
+    <variables>
+
+        <family name='eole sso'>
+            <variable name='eolesso_adresse' description="Nom de domaine du serveur d'authentification SSO" redefine="True" />
+        </family>
+
+    </variables>

    <constraints>

@ -26,6 +32,17 @@
            <param name='default_mismatch'>ldap</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>
        </auto>
Author	SHA1	Message	Date
Daniel Dehennin	2700a5d440	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.	2020-10-15 09:34:31 +02:00
Daniel Dehennin	9b66227236	eolesso_adresse should be forced only when LemonLDAP::NG is enabled The “calc_val” was failing when LemonLDAP::NG was disabled because “authWebName” can't be used. We shouldn't force “eolesso_adresse” when LemonLDAP::NG is disabled, the user must be able to set whatever value she wants. * dicos/71_lemonldap_ng_scribe.xml: fill the “eolesso_adresse” and freeze it when LemonLDAP::NG is enabled. Ref: #30852	2020-10-15 09:07:40 +02:00
Daniel Dehennin	90411f89f7	Override previous fill on eolesso_adresse Ref: #30852	2020-10-14 15:54:41 +02:00
Daniel Dehennin	d99ac8c9ad	Force local SSO on Scribe Ref: #30852	2020-10-14 15:46:39 +02:00