[Fusionforge-commits] r14209 - trunk/src/plugins/projects-hierarchy/common

Franck VILLAUME nerville at fusionforge.org
Wed Aug 24 11:43:56 CEST 2011


Author: nerville
Date: 2011-08-24 11:43:56 +0200 (Wed, 24 Aug 2011)
New Revision: 14209

Modified:
   trunk/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
Log:
use the tree flag from configuration

Modified: trunk/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
===================================================================
--- trunk/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php	2011-08-24 09:29:22 UTC (rev 14208)
+++ trunk/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php	2011-08-24 09:43:56 UTC (rev 14209)
@@ -119,6 +119,7 @@
 					where p1.group_id=plugin_projects_hierarchy_relationship.project_id
 					and p2.group_id=plugin_projects_hierarchy_relationship.sub_project_id
 					and plugin_projects_hierarchy_relationship.status=$1
+					and (select tree from plugin_projects_hierarchy where project_id = p2.group_id)
 					order by father_name, son_name',
 					array('t'));
 		echo db_error();
@@ -161,7 +162,7 @@
 			$returnTree .= '<table ><tr><td>';
 			$returnTree .= '<script type="text/javascript">';
 			$returnTree .= 'd = new dTree(\'d\');';
-			$returnTree .= 'd.add(0,-1,\'Project Tree\');';
+			$returnTree .= 'd.add(0,-1,\'Project Hierarchy Tree\');';
 			reset($arbre);
 			//construction automatique de l'arbre format : (num_fils, num_pere,nom,nom_unix)
 			while (list($key2, $sons2) = each($arbre)) {




More information about the Fusionforge-commits mailing list