[Fusionforge-commits] r13837 - in trunk/src/plugins/projects_hierarchy: common view

Franck VILLAUME nerville at fusionforge.org
Wed Jul 27 10:45:57 CEST 2011


Author: nerville
Date: 2011-07-27 10:45:56 +0200 (Wed, 27 Jul 2011)
New Revision: 13837

Modified:
   trunk/src/plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php
   trunk/src/plugins/projects_hierarchy/view/docman_project_link.php
Log:
fix enable/disable docman hierarchical browsing

Modified: trunk/src/plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php
===================================================================
--- trunk/src/plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php	2011-07-27 08:39:40 UTC (rev 13836)
+++ trunk/src/plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php	2011-07-27 08:45:56 UTC (rev 13837)
@@ -236,7 +236,7 @@
 	}
 
 	function getDocmanStatus($group_id) {
-		$res = db_query_params('SELECT docman FROM plugin_projects_hierarchy WHERE project_id = $1 or sub_project_id = $1 limit 1',
+		$res = db_query_params('SELECT docman FROM plugin_projects_hierarchy WHERE project_id = $1 limit 1',
 					array($group_id));
 		if (!$res)
 			return false;
@@ -256,8 +256,8 @@
 	 * @return	boolean	success or not
 	 */
 	function setDocmanStatus($group_id, $status = 0) {
-		$res = db_query_params('UPDATE plugin_projects_hierarchy set docman = $1 WHERE sub_project_id = $2 OR project_id = $3',
-					array($status, $group_id, $group_id));
+		$res = db_query_params('UPDATE plugin_projects_hierarchy set docman = $1 WHERE project_id = $2',
+					array($status, $group_id));
 
 		if (!$res)
 			return false;

Modified: trunk/src/plugins/projects_hierarchy/view/docman_project_link.php
===================================================================
--- trunk/src/plugins/projects_hierarchy/view/docman_project_link.php	2011-07-27 08:39:40 UTC (rev 13836)
+++ trunk/src/plugins/projects_hierarchy/view/docman_project_link.php	2011-07-27 08:45:56 UTC (rev 13837)
@@ -25,46 +25,16 @@
 global $group_id; // id of the group
 $projectsHierarchy = plugin_get_object('projects_hierarchy');
 
-if ($projectsHierarchy->getFamily($group_id, 'parent')) {
-	echo '<form id="projectsHierarchyDocman" name="projectsHierarchyDocman" method="post" action="/plugins/'.$projectsHierarchy->name.'/?action=projectsHierarchyDocman&id='.$group_id.'&type=group" >';
-	echo '<ul>';
-	$label = _('Enable hierarchical browsing');
-	$status = 1;
-	if ($projectsHierarchy->getDocmanStatus($group_id)) {
-		$label = _('Disable hierarchical browsing');
-		$status = 0;
-	}
-	echo '<input name="status" type="hidden" value="'.$status.'" />';
-	echo '<li><input id="projectsHierarchyDocmanSubmit" type="submit" value="'.$label.'" /></li>';
-	echo '</ul>';
-	echo '</form>';
+echo '<form id="projectsHierarchyDocman" name="projectsHierarchyDocman" method="post" action="/plugins/'.$projectsHierarchy->name.'/?action=projectsHierarchyDocman&id='.$group_id.'&type=group" >';
+echo '<ul>';
+$label = _('Enable hierarchical browsing');
+$status = 1;
+if ($projectsHierarchy->getDocmanStatus($group_id)) {
+	$label = _('Disable hierarchical browsing');
+	$status = 0;
 }
-
-$childs = $projectsHierarchy->getFamily($group_id,'child', true);
-if (sizeof($childs)) {
-	if ($projectsHierarchy->getDocmanStatus($group_id)) {
-		echo '<h3>'._('Subprojects Browsing Selection').'</h3>';
-		// display a tree ? with checkbox ? to limit scope of browsing
-		// include children of children ?
-		echo _('TO BE IMPLEMENTED VIEW');
-		echo '<table>';
-		echo '<thead>';
-		echo '<tr>';
-		echo '<th>'._('Subprojects').'</th>';
-		echo '<th>'._('Actions').'</th>';
-		echo '</thead>';
-		echo '<tbody>';
-		foreach ($childs as $child) {
-			$childGroup = group_get_object($child[0]);
-			if ($childGroup->usesDocman()) {
-				echo '<tr>';
-				echo '<td>'.$childGroup->getPublicName().'</td>';
-				echo '<td><label><input type="checkbox" />'._('Include in browsing').'</label></td>';
-				echo '</tr>';
-			}
-		}
-		echo '</tbody>';
-		echo '</table>';
-	}
-}
-?>
+echo '<input name="status" type="hidden" value="'.$status.'" />';
+echo '<li><input id="projectsHierarchyDocmanSubmit" type="submit" value="'.$label.'" /></li>';
+echo '</ul>';
+echo '</form>';
+?>
\ No newline at end of file




More information about the Fusionforge-commits mailing list