Changeset 594

Timestamp:

09/28/07 12:39:01 (1 year ago)

Author:

laurentj

Message:

fixed bug #275: a key parameter was missing on the jFormsBase:saveToDao method

Files:

• branches/1.0beta3.x/lib/jelix/controllers/jControllerDaoCrud.class.php (modified) (2 diffs)
• branches/1.0beta3.x/lib/jelix/controllers/jControllerDaoCrud.class.php (modified) (2 diffs)
• branches/1.0beta3.x/lib/jelix/forms/jFormsBase.class.php (modified) (2 diffs)
• branches/1.0beta3.x/lib/jelix/forms/jFormsBase.class.php (modified) (2 diffs)
• trunk/lib/jelix/controllers/jControllerDaoCrud.class.php (modified) (2 diffs)
• trunk/lib/jelix/controllers/jControllerDaoCrud.class.php (modified) (2 diffs)
• trunk/lib/jelix/forms/jFormsBase.class.php (modified) (2 diffs)
• trunk/lib/jelix/forms/jFormsBase.class.php (modified) (2 diffs)

branches/1.0beta3.x/lib/jelix/controllers/jControllerDaoCrud.class.php

@@ -189 +189 @@
-
-        if($form->check() && $this->_checkDatas($form)){
-
+null, 
-            $form->saveAllFiles($this->uploadsDirectory);
-            $rep->action = $this->_getAction('view');
@@ -265 +265 @@
-
-        if($form->check() && $this->_checkDatas($form)){
-
+null, 
-            $form->saveAllFiles($this->uploadsDirectory);
-            $rep->action = $this->_getAction('view');

branches/1.0beta3.x/lib/jelix/controllers/jControllerDaoCrud.class.php

@@ -189 +189 @@
-
-        if($form->check() && $this->_checkDatas($form)){
-
+null, 
-            $form->saveAllFiles($this->uploadsDirectory);
-            $rep->action = $this->_getAction('view');
@@ -265 +265 @@
-
-        if($form->check() && $this->_checkDatas($form)){
-
+null, 
-            $form->saveAllFiles($this->uploadsDirectory);
-            $rep->action = $this->_getAction('view');

branches/1.0beta3.x/lib/jelix/forms/jFormsBase.class.php

@@ -165 +165 @@
-     * 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
-     */
-
+key = null, $
-        $dao = jDao::create($daoSelector, $dbProfil);
-        $daorec = jDao::createRecord($daoSelector, $dbProfil);
@@ -195 +196 @@
-        }
-        if($this->_container->formId){
-
+
+
+
-            $dao->update($daorec);
-        }else{
+            if($key !== null)
+                $daorec->setPk($key);
-            // todo : what about updating the formId with the Pk.
-            $dao->insert($daorec);

branches/1.0beta3.x/lib/jelix/forms/jFormsBase.class.php

@@ -165 +165 @@
-     * 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
-     */
-
+key = null, $
-        $dao = jDao::create($daoSelector, $dbProfil);
-        $daorec = jDao::createRecord($daoSelector, $dbProfil);
@@ -195 +196 @@
-        }
-        if($this->_container->formId){
-
+
+
+
-            $dao->update($daorec);
-        }else{
+            if($key !== null)
+                $daorec->setPk($key);
-            // todo : what about updating the formId with the Pk.
-            $dao->insert($daorec);

trunk/lib/jelix/controllers/jControllerDaoCrud.class.php

@@ -189 +189 @@
-
-        if($form->check() && $this->_checkDatas($form)){
-
+null, 
-            $form->saveAllFiles($this->uploadsDirectory);
-            $rep->action = $this->_getAction('view');
@@ -265 +265 @@
-
-        if($form->check() && $this->_checkDatas($form)){
-
+null, 
-            $form->saveAllFiles($this->uploadsDirectory);
-            $rep->action = $this->_getAction('view');

trunk/lib/jelix/controllers/jControllerDaoCrud.class.php

@@ -189 +189 @@
-
-        if($form->check() && $this->_checkDatas($form)){
-
+null, 
-            $form->saveAllFiles($this->uploadsDirectory);
-            $rep->action = $this->_getAction('view');
@@ -265 +265 @@
-
-        if($form->check() && $this->_checkDatas($form)){
-
+null, 
-            $form->saveAllFiles($this->uploadsDirectory);
-            $rep->action = $this->_getAction('view');

trunk/lib/jelix/forms/jFormsBase.class.php

@@ -165 +165 @@
-     * 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
-     */
-
+key = null, $
-        $dao = jDao::create($daoSelector, $dbProfil);
-        $daorec = jDao::createRecord($daoSelector, $dbProfil);
@@ -195 +196 @@
-        }
-        if($this->_container->formId){
-
+
+
+
-            $dao->update($daorec);
-        }else{
+            if($key !== null)
+                $daorec->setPk($key);
-            // todo : what about updating the formId with the Pk.
-            $dao->insert($daorec);

trunk/lib/jelix/forms/jFormsBase.class.php

@@ -165 +165 @@
-     * 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
-     */
-
+key = null, $
-        $dao = jDao::create($daoSelector, $dbProfil);
-        $daorec = jDao::createRecord($daoSelector, $dbProfil);
@@ -195 +196 @@
-        }
-        if($this->_container->formId){
-
+
+
+
-            $dao->update($daorec);
-        }else{
+            if($key !== null)
+                $daorec->setPk($key);
-            // todo : what about updating the formId with the Pk.
-            $dao->insert($daorec);