[Fusionforge-commits] r13843 - in trunk/src/common/docman: . views

[Franck VILLAUME]

Author: nerville
Date: 2011-07-27 17:33:34 +0200 (Wed, 27 Jul 2011)
New Revision: 13843

Modified:
   trunk/src/common/docman/DocumentManager.class.php
   trunk/src/common/docman/views/tree.php
Log:
start to display other trees from child projects

Modified: trunk/src/common/docman/DocumentManager.class.php
===================================================================
--- trunk/src/common/docman/DocumentManager.class.php	2011-07-27 13:27:03 UTC (rev 13842)
+++ trunk/src/common/docman/DocumentManager.class.php	2011-07-27 15:33:34 UTC (rev 13843)
@@ -163,16 +163,16 @@
 		<script type="text/javascript" src="<?php echo util_make_uri('/jscook/JSCookTree.js'); ?>"></script>
 		<script src="<?php echo util_make_uri('/jscook/ThemeXP/theme.js'); ?>" type="text/javascript"></script>
 
-		<div id="myMenuID" style="overflow:auto;"></div>
+		<div id="menu<?php echo $this->Group->getID() ?>" style="overflow:auto;"></div>
 
 		<script language="JavaScript" type="text/javascript">/* <![CDATA[ */
 			var myMenu =
 				[
-					['<span class="JSCookTreeFolderClosed"><i><img alt="" src="' + myThemeXPBase + 'folder1.gif" /></i></span><span id="ctItemID0" class="JSCookTreeFolderOpen"><i><img alt="" src="' + myThemeXPBase + 'folderopen1.gif" /></i></span>', '<?php echo $label ?>', '<?php echo '?group_id='.$this->Group->getID().'&view='.$linkmenu ?>', '', '', <?php $this->getJSTreeEntry(0, $linkmenu); ?>
+					['<span class="JSCookTreeFolderClosed"><i><img alt="" src="' + myThemeXPBase + 'folder1.gif" /></i></span><span id="<?php echo $this->Group->getID().'ctItemID0' ?>" class="JSCookTreeFolderOpen"><i><img alt="" src="' + myThemeXPBase + 'folderopen1.gif" /></i></span>', '<?php echo $label ?>', '<?php echo '?group_id='.$this->Group->getID().'&view='.$linkmenu ?>', '', '', <?php $this->getJSTreeEntry(0, $linkmenu); ?>
 					]
 				];
 
-			var treeIndex = ctDraw('myMenuID', myMenu, ctThemeXP1, 'ThemeXP', 0, 1);
+			var treeIndex = ctDraw('<?php echo 'menu'.$this->Group->getID() ?>', myMenu, ctThemeXP1, 'ThemeXP', 0, 1);
 			ctExposeTreeIndex(treeIndex, <?php echo $idExposeTreeIndex ?>);
 			var openItem = ctGetSelectedItem(treeIndex);
 			ctOpenFolder(openItem);

Modified: trunk/src/common/docman/views/tree.php
===================================================================
--- trunk/src/common/docman/views/tree.php	2011-07-27 13:27:03 UTC (rev 13842)
+++ trunk/src/common/docman/views/tree.php	2011-07-27 15:33:34 UTC (rev 13843)
@@ -46,24 +46,24 @@
 if ($g->usesPlugin('projects_hierarchy')) {
 	$displayProjectName = 1;
 	$projectsHierarchy = plugin_get_object('projects_hierarchy');
-	//$projectIDsArray = $projectsHierarchy->getFamilyID($group_id);
 	$projectIDsArray = array($g->getID());
+	$projectIDsArray = array_merge($projectIDsArray, $projectsHierarchy->getFamilyID($group_id, 'child', false, 'validated'));
 } else {
 	$displayProjectName = 0;
 	$projectIDsArray = array($g->getID());
 }
 echo '<div id="documenttree" style="height:100%">';
-foreach ($projectIDsArray as $projectID) {
+foreach ($projectIDsArray as $key=>$projectID) {
 	$groupObject = group_get_object($projectID);
-	$dm = new DocumentManager($g);
+	$dm = new DocumentManager($groupObject);
 	$dm->getJSTree($linkmenu, $displayProjectName);
 	echo '<noscript>';
 	echo '<ul>';
 	$label = '/';
 	if ($displayProjectName)
-		$label = $g->getPublicName();
+		$label = $groupObject->getPublicName();
 
-	echo '<li><a href="?group_id='.$group_id.'&view='.$linkmenu.'">/</a></il>';
+	echo '<li><a href="?group_id='.$groupObject->getID().'&view='.$linkmenu.'">/</a></il>';
 	$dm->getTree($linkmenu, $displayProjectName);
 	echo '</ul>';
 	echo '</noscript>';