[phpBT-dev] CVS: phpbt bug.php,1.146,1.147

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26573

Modified Files:
	bug.php 
Log Message:
Bug #924226 -- Some changes to bugs not captured in history.
Added "priority" and "dependency" to the bug history


Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- bug.php	9 Sep 2005 20:22:25 -0000	1.146
+++ bug.php	20 Sep 2005 18:49:39 -0000	1.147
@@ -149,7 +149,7 @@
 	$template = $newbug ? "bugemail-newbug.$template_ext" : "bugemail.$template_ext";
 	foreach(array('title','url') as $field) {
 		if (isset($cf[$field])) {
-			$db->query('insert into '.TBL_BUG_HISTORY.' (bug_id, changed_field, old_value, new_value, created_by, created_date) values ('. join(', ', array($buginfo['bug_id'], $db->quote($field), $db->quote(stripslashes($buginfo[$field])), $db->quote(stripslashes($cf[$field])), $u, $now)).")");
+			$db->query('insert into '.TBL_BUG_HISTORY.' (bug_id, changed_field, old_value, new_value, created_by, created_date) values ('. join(', ', array($buginfo['bug_id'], $db->quote(translate($field)), $db->quote(stripslashes($buginfo[$field])), $db->quote(stripslashes($cf[$field])), $u, $now)).")");
 			$t->assign(array(
 				$field => stripslashes($cf[$field]),
 				$field.'_stat' => '!'
@@ -178,6 +178,12 @@
 	);
 
 	foreach($cfgDatabase as $field => $table) {
+		if (isset($buginfo[$field]) && !isset($buginfo[$field.'_id'])) {
+			$buginfo[$field.'_id'] = $buginfo[$field];
+		}
+		if (isset($cf[$field]) && !isset($cf[$field.'_id'])) {
+			$cf[$field.'_id'] = $cf[$field];
+		}
 		if (isset($buginfo[$field.'_id'])) {
 			$oldvalue = $db->getOne("select ${field}_name from $table"." where ${field}_id = {$buginfo[$field.'_id']}");
 		}
@@ -418,15 +424,26 @@
 			return;
 		}
 
+		$old_dependencies = delimit_list(', ', $db->getCol("select depends_on from ".TBL_BUG_DEPENDENCY." where bug_id = $bugid"));
 		// Add it
 		$db->query("insert into ".TBL_BUG_DEPENDENCY." (bug_id, depends_on) values($bugid, $add_dependency)");
+		$new_dependencies = delimit_list(', ', $db->getCol("select depends_on from ".TBL_BUG_DEPENDENCY." where bug_id = $bugid"));
+
+		$db->query('insert into '.TBL_BUG_HISTORY.' (bug_id, changed_field, old_value, new_value, created_by, created_date) values('. join(', ', array($bugid, $db->quote(translate("dependency")), $db->quote($old_dependencies), $db->quote($new_dependencies), $u, $now)).")");
 	}
 
 	// Remove dependency if requested
 	if (!empty($del_dependency)) {
 		$del_dependency = preg_replace('/\D/', '', $del_dependency);
 		if (is_numeric($del_dependency)) {
-			$db->query("delete from ".TBL_BUG_DEPENDENCY." where bug_id = $bugid and depends_on = $del_dependency");
+			// Check if the dependency has already been added
+			if ($db->getOne('select count(*) from '.TBL_BUG_DEPENDENCY." where bug_id = $bugid and depends_on = $del_dependency")) {
+				$old_dependencies = delimit_list(', ', $db->getCol("select depends_on from ".TBL_BUG_DEPENDENCY." where bug_id = $bugid"));
+				$db->query("delete from ".TBL_BUG_DEPENDENCY." where bug_id = $bugid and depends_on = $del_dependency");
+				$new_dependencies = delimit_list(', ', $db->getCol("select depends_on from ".TBL_BUG_DEPENDENCY." where bug_id = $bugid"));
+
+				$db->query('insert into '.TBL_BUG_HISTORY.' (bug_id, changed_field, old_value, new_value, created_by, created_date) values('. join(', ', array($bugid, $db->quote(translate("dependency")), $db->quote($old_dependencies), $db->quote($new_dependencies), $u, $now)).")");
+			}
 		}
 	}