[Fusionforge-commits] FusionForge branch Branch_5_2 updated. 2fb0adf0abeb3d64c5c2213050c9ecf073a23944

Franck VILLAUME nerville at fusionforge.org
Fri Feb 22 11:35:11 CET 2013


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, Branch_5_2 has been updated
       via  2fb0adf0abeb3d64c5c2213050c9ecf073a23944 (commit)
      from  c6c5e89aab6b153cc2e7a4d6d3839e1bbcb1bf57 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2fb0adf0abeb3d64c5c2213050c9ecf073a23944
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Fri Feb 22 11:34:04 2013 +0100

    projects-hierarchy: fix display child project name & do not permit multiple fathers

diff --git a/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php b/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
index 48d2643..23152e6 100644
--- a/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
+++ b/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
@@ -4,7 +4,7 @@
  *
  * Copyright 2006 (c) Fabien Regnier - Sogeti
  * Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2012, Franck Villaume - TrivialDev
+ * Copyright 2012-2013, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -805,7 +805,8 @@ class projects_hierarchyPlugin extends Plugin {
 					WHERE status = $1
 					AND group_id != $2
 					AND group_id <> ALL ($3)
-					AND group_id IN (select group_id from group_plugin,plugins where group_plugin.plugin_id = plugins.plugin_id and plugins.plugin_name = $4);',
+					AND group_id IN (select group_id from group_plugin,plugins where group_plugin.plugin_id = plugins.plugin_id and plugins.plugin_name = $4)
+					AND group_id NOT IN (select sub_project_id from plugin_projects_hierarchy_relationship);',
 					array('A',
 						$group_id,
 						db_int_array_to_any_clause($family),
diff --git a/src/plugins/projects-hierarchy/view/home_project_link.php b/src/plugins/projects-hierarchy/view/home_project_link.php
index 6345ad0..f4de63e 100644
--- a/src/plugins/projects-hierarchy/view/home_project_link.php
+++ b/src/plugins/projects-hierarchy/view/home_project_link.php
@@ -4,6 +4,7 @@
  *
  * Copyright 2006 (c) Fabien Regnier - Sogeti
  * Copyright 2010-2011, Franck Villaume - Capgemini
+ * Copyright 2013, French Ministry of Education
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -42,8 +43,8 @@ if (sizeof($parent) || sizeof($childs)) {
 
 		echo '<ul>';
 		foreach ($childs as $child) {
-			$childGroup = group_get_object($child[0]);
-			echo '<li>'._('Child project').' '.util_make_link('/projects/'.$childGroup->getUnixName(), $childGroup->getPublicName(), array('class' => 'tabtitle', 'title' => _('Direct link to project'))).'</li>';
+			$childGroup = group_get_object($child);
+			echo '<li>'._('Child project').': '.util_make_link('/projects/'.$childGroup->getUnixName(), $childGroup->getPublicName(), array('class' => 'tabtitle', 'title' => _('Direct link to project'))).'</li>';
 		}
 		echo '</ul>';
 	}

-----------------------------------------------------------------------

Summary of changes:
 .../projects-hierarchy/common/projects-hierarchyPlugin.class.php  |    5 +++--
 src/plugins/projects-hierarchy/view/home_project_link.php         |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list