[evolvis-commits] r15399: Set error before rollback to capture db_error().

mirabilos at evolvis.org mirabilos at evolvis.org
Tue Mar 1 00:05:24 CET 2011


Author: mirabilos
Date: 2011-03-01 00:05:23 +0100 (Tue, 01 Mar 2011)
New Revision: 15399

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactType.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactTypes.class.php
Log:
Set error before rollback to capture db_error().

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactType.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactType.class.php	2011-02-28 23:05:20 UTC (rev 15398)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactType.class.php	2011-02-28 23:05:23 UTC (rev 15399)
@@ -664,8 +664,8 @@
 			//new field in this tracker
 			$nef = new ArtifactExtraField($this);
 			if (!$nef->create( addslashes(util_unconvert_htmlspecialchars($ef['field_name'])), $ef['field_type'], $ef['attribute1'], $ef['attribute2'], $ef['is_required'], $ef['alias'])) {
+				$this->setError('Error Creating New Extra Field: '.$nef->getErrorMessage());
 				db_rollback();
-				$this->setError('Error Creating New Extra Field: '.$nef->getErrorMessage());
 				return false;
 			}
 			//

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactTypes.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactTypes.class.php	2011-02-28 23:05:20 UTC (rev 15398)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactTypes.class.php	2011-02-28 23:05:23 UTC (rev 15399)
@@ -84,16 +84,16 @@
 		foreach ($trackers as $trk) {
 			$at = new ArtifactType($this->Group);
 			if (!$at || !is_object($at)) {
+				$this->setError('Error Getting Tracker Object');
 				db_rollback();
-				$this->setError('Error Getting Tracker Object');
 				return false;
 			}
 			//
 			//	Create a tracker
 			//
 			if (!$at->create($trk[0], $trk[1], $trk[2], $trk[3], $trk[4], $trk[5], $trk[6], $trk[7], $trk[8], $trk[9], $trk[10])) {
+				$this->setError('Error Creating Tracker: '.$at->getErrorMessage());
 				db_rollback();
-				$this->setError('Error Creating Tracker: '.$at->getErrorMessage());
 				return false;
 			} else {
 				//
@@ -103,8 +103,8 @@
 					$aef = new ArtifactExtraField($at);
 //print($fld[0])."***|";
 					if (!$aef->create($fld[0], $fld[1], $fld[2], $fld[3], $fld[4])) {
+						$this->setError('Error Creating Extra Field: '.$aef->getErrorMessage());
 						db_rollback();
-						$this->setError('Error Creating Extra Field: '.$aef->getErrorMessage());
 						return false;
 					} else {
 						//
@@ -127,8 +127,8 @@
 								$el_status = $el[1];
 							}
 							if (!$aefe->create($el_name,$el_status)) {
+								$this->setError('Error Creating Extra Field Element: '.$aefe->getErrorMessage());
 								db_rollback();
-								$this->setError('Error Creating Extra Field Element: '.$aefe->getErrorMessage());
 								return false;
 							}
 						}



More information about the evolvis-commits mailing list