Ticket #497: patch-497.diff

lib/jelix/forms/jFormsBase.class.php

@@ -4 +4 @@
-* @subpackage  forms
-* @author      Laurent Jouanneau
-* @contributor Dominique Papin
-
+
+
-* @link        http://www.jelix.org
-* @licence     http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file
-*/
@@ -206 +207 @@
-    }
-
-    /**
-
-
+
-     * @param string $daoSelector the selector of a dao file
-     * @param string $key the primary key for the dao. if null, takes the form ID as primary key
-     * @param string $dbProfil the jDb profil to use with the dao
- the primary key of the new record in a case of inserting
+return three var : $daorec, $dao, $toInsert which have to be extracted
-     * @see jDao
-     */
-saveToDao
+prepareDaoFromControls
-        $dao = jDao::create($daoSelector, $dbProfil);
-
-        if($key === null)
@@ -269 +269 @@
-                $daorec->$name = $dt->toString(jDateTime::DB_DFORMAT);
-            }
-        }
+        return compact("daorec", "dao", "toInsert");
+    }
+
+
+    /**
+     * save datas using a dao.
+     * it call insert or update depending the value of the formId stored in the container
+     * @param string $daoSelector the selector of a dao file
+     * @param string $key the primary key for the dao. if null, takes the form ID as primary key
+     * @param string $dbProfil the jDb profil to use with the dao
+     * @return mixed  the primary key of the new record in a case of inserting
+     * @see jDao
+     */
+    public function saveToDao($daoSelector, $key = null, $dbProfil=''){
+        extract($this->prepareDaoFromControls($daoSelector,$key,$dbProfil));
-        if($toInsert){
-            // todo : what about updating the formId with the Pk ?
-            $dao->insert($daorec);