[Fusionforge-commits] r14012 - trunk/src/common/docman/views

Franck VILLAUME nerville at fusionforge.org
Fri Jul 29 17:45:42 CEST 2011


Author: nerville
Date: 2011-07-29 17:45:42 +0200 (Fri, 29 Jul 2011)
New Revision: 14012

Modified:
   trunk/src/common/docman/views/listfile.php
   trunk/src/common/docman/views/tree.php
Log:
fix numberFiles in child project

Modified: trunk/src/common/docman/views/listfile.php
===================================================================
--- trunk/src/common/docman/views/listfile.php	2011-07-29 15:39:45 UTC (rev 14011)
+++ trunk/src/common/docman/views/listfile.php	2011-07-29 15:45:42 UTC (rev 14012)
@@ -34,6 +34,7 @@
 global $u; // User object
 global $g; // the Group object
 
+$linkmenu = 'listfile';
 $baseredirecturl = '/docman/?group_id='.$group_id;
 $redirecturl = $baseredirecturl.'&view=listfile&dirid='.$dirid;
 $actionlistfileurl = '?group_id='.$group_id.'&view=listfile&dirid='.$dirid;
@@ -42,6 +43,10 @@
 	session_redirect($baseredirecturl.'&warning_msg='.urlencode($return_msg));
 }
 
+echo '<div id="left" style="float:left; width:17%; min-width: 50px; overflow: auto;">';
+include ($gfcommon.'docman/views/tree.php');
+echo '</div>';
+
 // plugin projects_hierarchy
 $childgroup_id = getIntFromRequest('childgroup_id');
 if ($childgroup_id) {
@@ -74,7 +79,6 @@
  */
 $d_arr =& $df->getDocuments();
 $nested_groups = $dgf->getNested();
-$linkmenu = 'listfile';
 
 $nested_docs = array();
 $DocGroupName = 0;
@@ -140,9 +144,6 @@
 /* ]]> */</script>
 
 <?php
-echo '<div id="left" style="float:left; width:17%; min-width: 50px; overflow: auto;">';
-include ($gfcommon.'docman/views/tree.php');
-echo '</div>';
 echo '<div id="handle" style="float:left; height:100px; margin:3px; width:3px; background: #000; cursor:e-resize;"></div>';
 echo '<div id="right" style="float:left; width: 80%; overflow: auto; max-width: 90%;">';
 if ($DocGroupName) {

Modified: trunk/src/common/docman/views/tree.php
===================================================================
--- trunk/src/common/docman/views/tree.php	2011-07-29 15:39:45 UTC (rev 14011)
+++ trunk/src/common/docman/views/tree.php	2011-07-29 15:45:42 UTC (rev 14012)
@@ -36,11 +36,6 @@
 	session_redirect('/docman/?group_id='.$group_id.'&warning_msg='.urlencode($return_msg));
 }
 
-// plugin hierarchy : since tree is loaded from listfile.php, you need to be sure that
-if ($childgroup_id) {
-	$g = group_get_object($group_id);
-}
-
 echo '<div id="documenttree" style="height:100%">';
 $dm = new DocumentManager($g);
 $dm->getTree($dirid, $linkmenu);




More information about the Fusionforge-commits mailing list