[evolvis-commits] r17101: Merged branch tracker-status-in-tasks

mirabilos at evolvis.org mirabilos at evolvis.org
Tue Mar 1 02:02:25 CET 2011


Author: mirabilos
Date: 2011-03-01 02:02:25 +0100 (Tue, 01 Mar 2011)
New Revision: 17101

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectTask.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/pm/include/ProjectTaskHTML.class.php
Log:
Merged branch tracker-status-in-tasks

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectTask.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectTask.class.php	2011-03-01 01:02:22 UTC (rev 17100)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectTask.class.php	2011-03-01 01:02:25 UTC (rev 17101)
@@ -5,7 +5,8 @@
  * Copyright 1999-2000, Tim Perdue/Sourceforge
  * Copyright 2002, Tim Perdue/GForge, LLC
  * Copyright 2009, Roland Mas
- * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
+ * Copyright 2010, Alain Peyrat - Alcatel-Lucent
+ * Copyright 2011, Thorsten Glaser <t.glaser at tarent.de>
  *
  * This file is part of FusionForge.
  *
@@ -427,9 +428,10 @@
 	function getRelatedArtifacts() {
 		if (!$this->relatedartifacts) {
 			$this->relatedartifacts=
-				db_query_params ('SELECT agl.group_id,agl.name,agl.group_artifact_id,a.artifact_id,a.open_date,a.summary 
-			FROM artifact_group_list agl, artifact a 
+				db_query_params ('SELECT agl.group_id,agl.name,agl.group_artifact_id,a.artifact_id,a.open_date,a.summary,ast.status_name
+			FROM artifact_group_list agl, artifact a, artifact_status ast
 			WHERE a.group_artifact_id=agl.group_artifact_id
+                        AND ast.id=a.status_id
 			AND EXISTS (SELECT artifact_id FROM project_task_artifact 
 				WHERE artifact_id=a.artifact_id
 				AND project_task_id=$1)',

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/pm/include/ProjectTaskHTML.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/pm/include/ProjectTaskHTML.class.php	2011-03-01 01:02:22 UTC (rev 17100)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/pm/include/ProjectTaskHTML.class.php	2011-03-01 01:02:25 UTC (rev 17101)
@@ -107,6 +107,7 @@
 			$title_arr=array();
 			$title_arr[]=_('Artifact Summary');
 			$title_arr[]=_('Tracker');
+			$title_arr[]=_('Status');
 			$title_arr[]=_('Open Date');
 			(($is_admin) ? $title_arr[]=_('Remove Relation') : '');
 		
@@ -117,6 +118,7 @@
 				<tr '. $GLOBALS['HTML']->boxGetAltRowStyle($i) .'>
 					<td>'.util_make_link ('/tracker/?func=detail&aid='.db_result($res,$i,'artifact_id').'&group_id='.db_result($res,$i,'group_id').'&atid='.db_result($res,$i,'group_artifact_id'), db_result($res,$i,'summary')).'</td>
 					<td>'. db_result($res,$i,'name') .'</td>
++					<td>'. db_result($res,$i,'status_name') . '</td>
 					<td>'. date(_('Y-m-d H:i'),db_result($res,$i,'open_date')) .'</td>'.
 					(($is_admin) ? '<td><input type="checkbox" name="rem_artifact_id[]" value="'.db_result($res,$i,'artifact_id').'" /></td>' : '').
 					'</tr>';



More information about the evolvis-commits mailing list