Changeset 104885 in spip-zone

Timestamp:

Jun 16, 2017, 9:59:24 AM (2 years ago)

Author:

dorch@…

Message:

Correction régression introduite dans la r104873 sur la gestion des champs obligatoires.

Location:

_plugins_/hydraulic/trunk

Files:

• hyd_inc/formulaire.abstract.class.php (modified) (4 diffs)
• plugin.xml (modified) (1 diff)

_plugins_/hydraulic/trunk/hyd_inc/formulaire.abstract.class.php

@@ -211 +211 @@
                 //On récupère les données
                 foreach($tChOblig as $champ) {
+                        if(self::DBG) spip_log( $champ.'=>'._request($champ),'hydraulic',_LOG_DEBUG);
                         if (_request($champ)!==false){
                                 $data[$champ] = _request($champ);
@@ -225 +226 @@
                         $choix_radio[$cle] = _request('choix_champs_'.$cle);
                 }
+                if(self::DBG) spip_log($choix_radio,'hydraulic',_LOG_DEBUG);
 
                 $data['min'] = 0;
@@ -264 +266 @@
                 $tCtrl = array();
                 $tData = array();
+                $sValCal = (isset($this->data['ValCal']))?$this->data['ValCal']:false;
 
                 foreach($this->saisies as $fs) {
                         foreach($fs[1] as $cle=>$val) {
-                                $tData[$cle] = (isset($this->data[$cle]))?$this->data[$cle]:999;
-                                $tCtrl[$cle] = $val[2];
+                                if($cle != $sValCal) {
+                                        if(isset($this->data[$cle])) {
+                                                $tData[$cle] = $this->data[$cle];
+                                        }
+                                        $tCtrl[$cle] = $val[2];
+                                }
                         }
                 }
@@ -274 +281 @@
                 $erreurs = array();
                 foreach($tCtrl as $Cle=>$Ctrl) {
-                        $tData[$Cle] = trim(str_replace(',','.',$tData[$Cle]));
+                        if(isset($tData[$Cle])) {
+                                $tData[$Cle] = trim(str_replace(',','.',$tData[$Cle]));
+                        }
                         if(strpos($Ctrl,'o')!==false & (!isset($tData[$Cle]) | $tData[$Cle]=="")) {
                                 // Champ obligatoire

_plugins_/hydraulic/trunk/plugin.xml

@@ -8 +8 @@
         <auteur>David Dorchies, Médéric Dulondel</auteur>
         <licence>GNU/GLP</licence>
-        <version>0.11.5</version>
+        <version>0.11.6</version>
         <necessite id="lib:dist" src="http://www.jqplot.com/download/jquery.jqplot.1.0.8r1250.zip" />
         <slogan>