[Fusionforge-commits] r14206 - in trunk/src/plugins/projects-hierarchy: common db view/admin

Franck VILLAUME nerville at fusionforge.org
Wed Aug 24 10:51:41 CEST 2011


Author: nerville
Date: 2011-08-24 10:51:41 +0200 (Wed, 24 Aug 2011)
New Revision: 14206

Modified:
   trunk/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
   trunk/src/plugins/projects-hierarchy/db/projects-hierarchy-init.sql
   trunk/src/plugins/projects-hierarchy/view/admin/viewProjectConfiguration.php
Log:
fix admin view page

Modified: trunk/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
===================================================================
--- trunk/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php	2011-08-24 08:25:47 UTC (rev 14205)
+++ trunk/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php	2011-08-24 08:51:41 UTC (rev 14206)
@@ -628,6 +628,39 @@
 		return $returnArr;
 	}
 
+	/**
+	 * getConf - return the configuration defined at project level
+	 *
+	 * @param	integer	the group id
+	 * @return	array	the configuration array
+	 */
+	function getConf($project_id) {
+		$resConf = db_query_params('SELECT * from plugin_projects_hierarchy where project_id=$1',array($project_id));
+		if (!$resConf) {
+			return false;
+		}
+
+		$row = db_numrows($resConf);
+
+		if ($row == null || count($row) > 2) {
+			return false;
+		}
+
+		$resArr = db_fetch_array($resConf);
+		$returnArr = array();
+
+		foreach($resArr as $column => $value) {
+			if ($value == 't') {
+				$returnArr[$column] = true;
+			} else {
+				$returnArr[$column] = false;
+			}
+		}
+
+		return $returnArr;
+	}
+
+
 	function getProjectAdminView() {
 		global $gfplugins, $use_tooltips;
 		include $gfplugins.$this->name.'/view/admin/viewProjectConfiguration.php';

Modified: trunk/src/plugins/projects-hierarchy/db/projects-hierarchy-init.sql
===================================================================
--- trunk/src/plugins/projects-hierarchy/db/projects-hierarchy-init.sql	2011-08-24 08:25:47 UTC (rev 14205)
+++ trunk/src/plugins/projects-hierarchy/db/projects-hierarchy-init.sql	2011-08-24 08:51:41 UTC (rev 14206)
@@ -2,7 +2,8 @@
 	project_id integer DEFAULT 0 NOT NULL,
 	tree boolean DEFAULT true,
 	docman boolean DEFAULT false,
-	delegate boolean DEFAULT false
+	delegate boolean DEFAULT false,
+	globalconf boolean DEFAULT false
 );
 
 CREATE TABLE plugin_projects_hierarchy_global (

Modified: trunk/src/plugins/projects-hierarchy/view/admin/viewProjectConfiguration.php
===================================================================
--- trunk/src/plugins/projects-hierarchy/view/admin/viewProjectConfiguration.php	2011-08-24 08:25:47 UTC (rev 14205)
+++ trunk/src/plugins/projects-hierarchy/view/admin/viewProjectConfiguration.php	2011-08-24 08:51:41 UTC (rev 14206)
@@ -24,32 +24,45 @@
 global $HTML;
 global $projectsHierarchy;
 global $use_tooltips;
+global $group_id;
 
-$projectsHierarchyGlobalConf = $projectsHierarchy->getGlobalconf();
+$projectsHierarchyProjectConf = $projectsHierarchy->getConf($group_id);
+if (!$projectsHierarchyProjectConf) {
+	echo '<div class="error">'._('Cannot retrieve data from DB').'</div>';
+} else {
+	echo $HTML->boxTop(_('Manage project configuration'));
+	echo '<form method="post" action="?type=admin&&pluginname='.$projectsHierarchy->name.'&action=updateProjectConf">';
+	echo '<table>';
 
-echo $HTML->boxTop(_('Manage project configuration'));
-echo '<form method="post" action="?type=admin&&pluginname='.$projectsHierarchy->name.'&action=updateProjectConf">';
-echo '<table>';
+	echo '<tr><td><label id="projectsHierarchy-tree" ';
+	if ($use_tooltips)
+		echo 'title="'._('Enable visibily in hierarchy tree.').'"';
+	echo ' >'._('Enable tree').'</label></td><td><input type="checkbox" name="tree" value="1"';
+	if ($projectsHierarchyProjectConf['tree'])
+		echo 'checked="checked" ';
 
-echo '<tr><td><label id="projectsHierarchy-delegate" ';
-if ($use_tooltips)
-	echo 'title="'._('Enable full rights and configuration delegation to parent.').'"';
-echo ' >'._('Enable delegate').'</label></td><td><input type="checkbox" name="delegate" value="1"';
-if ($projectsHierarchyProjectConf['delegate'])
-	echo 'checked="checked" ';
+	echo '/></td></tr>';
 
-echo '/></td></tr>';
-echo '<tr><td><label id="projectsHierarchy-globalconf" ';
-if ($use_tooltips)
-	echo 'title="'._('Use forge global configuration. Superseed any configuration done at project level.').'"';
-echo ' >'._('Use forge global configuration').'</label></td><td><input type="checkbox" name="globalconf" value="1"';
-if ($projectsHierarchyProjectConf['globalconf'])
-	echo 'checked="checked" ';
+	echo '<tr><td><label id="projectsHierarchy-delegate" ';
+	if ($use_tooltips)
+		echo 'title="'._('Enable full rights and configuration delegation to parent.').'"';
+	echo ' >'._('Enable delegate').'</label></td><td><input type="checkbox" name="delegate" value="1"';
+	if ($projectsHierarchyProjectConf['delegate'])
+		echo 'checked="checked" ';
 
-echo '/></td></tr>';
+	echo '/></td></tr>';
+	echo '<tr><td><label id="projectsHierarchy-globalconf" ';
+	if ($use_tooltips)
+		echo 'title="'._('Use forge global configuration. Superseed any configuration done at project level.').'"';
+	echo ' >'._('Use forge global configuration').'</label></td><td><input type="checkbox" name="globalconf" value="1"';
+	if ($projectsHierarchyProjectConf['globalconf'])
+		echo 'checked="checked" ';
 
-echo '</table>';
-echo '<input type="submit" value="'._('Update').'" />';
-echo '</form>';
-echo $HTML->boxBottom();
+	echo '/></td></tr>';
+
+	echo '</table>';
+	echo '<input type="submit" value="'._('Update').'" />';
+	echo '</form>';
+	echo $HTML->boxBottom();
+}
 ?>




More information about the Fusionforge-commits mailing list