[Fusionforge-commits] r7195 - in trunk/gforge/www: include project/admin softwaremap

Julien HEYMAN jheyman at libremir.placard.fr.eu.org
Thu Mar 19 15:53:13 CET 2009


Author: jheyman
Date: 2009-03-19 15:53:13 +0100 (Thu, 19 Mar 2009)
New Revision: 7195

Modified:
   trunk/gforge/www/include/features_boxes.php
   trunk/gforge/www/include/project_home.php
   trunk/gforge/www/include/trove.php
   trunk/gforge/www/project/admin/project_admin_utils.php
   trunk/gforge/www/softwaremap/trove_list.php
Log:
Add features : Display projects stats, only if stats are used

Modified: trunk/gforge/www/include/features_boxes.php
===================================================================
--- trunk/gforge/www/include/features_boxes.php	2009-03-19 09:34:04 UTC (rev 7194)
+++ trunk/gforge/www/include/features_boxes.php	2009-03-19 14:53:13 UTC (rev 7195)
@@ -169,6 +169,7 @@
 		"AND groups.is_public=1 ".
 		"AND groups.type_id=1  ".
 		"AND groups.status != 'D'  ".
+		"AND groups.use_stats=1  ".
 		"ORDER BY ranking ASC";
 	$result=db_query($sql,20);
 	if (!$result || db_numrows($result) < 1) {

Modified: trunk/gforge/www/include/project_home.php
===================================================================
--- trunk/gforge/www/include/project_home.php	2009-03-19 09:34:04 UTC (rev 7194)
+++ trunk/gforge/www/include/project_home.php	2009-03-19 14:53:13 UTC (rev 7195)
@@ -53,7 +53,7 @@
 
 if($GLOBALS['sys_use_trove']) {
 	print "<br />\n";
-	print stripslashes(trove_getcatcompletelisting($group_id));
+	print stripslashes(trove_getcatlisting($group_id,0,1,1));
 }
 
 // registration date

Modified: trunk/gforge/www/include/trove.php
===================================================================
--- trunk/gforge/www/include/trove.php	2009-03-19 09:34:04 UTC (rev 7194)
+++ trunk/gforge/www/include/trove.php	2009-03-19 14:53:13 UTC (rev 7195)
@@ -221,7 +221,7 @@
  * @param		bool	Whether filters have already been applied
  * @param		bool	Whether to print category links
  */
-function trove_getcatlisting($group_id,$a_filter,$a_cats) {
+function trove_getcatlisting($group_id,$a_filter,$a_cats,$a_complete) {
 	global $discrim_url;
 	global $expl_discrim;
 	global $form_cat;
@@ -258,7 +258,10 @@
 			if (!$isfirstdiscrim) {
 				$return .= "</li>\n";
 			}
-			$return .= ('<li> '.$folders[0].': ');
+			$return .= '<li>';
+			if ($a_complete==0) {
+				$return .= $folders[0].' : ';
+			}
 		}
 
 		// filter links, to add discriminators
@@ -271,17 +274,34 @@
 		}
 		// then print the stuff
 		if (array_key_exists($folders_ids[0], $proj_discrim_used)) {
-			$return .= ', ';
+			$return .= '</li><li>';
 		}
 
-		if ($a_cats) {
-			$return .= '<a href="'
-			.util_make_url ('/softwaremap/trove_list.php?form_cat='.$folders_ids[$folders_len-1].$discrim_url).'">';
+		if ($a_complete) {
+			for ($i=0;$i<$folders_len;$i++) {
+				if ($a_cats) {
+					$return .= '<a href="'.util_make_url ('/softwaremap/trove_list.php?form_cat='.$folders_ids[$i].$discrim_url).'">';
+				}
+				$return .= ($folders[$i]);
+				if ($a_cats) {
+					$return .= '</a>';
+				}
+				if ($i!=$folders_len-1) {
+					$return .= " : ";
+				}
+			}
+		} else {
+			if ($a_cats) {
+				$return .= '<a href="'.util_make_url ('/softwaremap/trove_list.php?form_cat='.$folders_ids[$folders_len-1].$discrim_url).'">';
+			}
+			$return .= ($folders[$folders_len-1]);
+			if ($a_cats) {
+				$return .= '</a>';
+			}
+			if ($i!=$folders_len-1) {
+				$return .= " : ";
+			}
 		}
-		$return .= ($folders[$folders_len-1]);
-		if ($a_cats) {
-			$return .= '</a>';
-		}
 
 		if ($a_filter) {
 			if ($filterisalreadyapplied) {
@@ -307,58 +327,6 @@
 }
 
 /**
- * trove_getcatcompletelisting() - Gets complete discriminator listing for a group
- *
- * @param		int		The group ID
- */
-function trove_getcatcompletelisting($group_id) {
-	global $discrim_url;
-	global $form_cat;
-	global $Language;
-
-	$res_trovecat = db_query("
-		SELECT trove_cat.fullpath AS fullpath,
-			trove_cat.fullpath_ids AS fullpath_ids,
-			trove_cat.trove_cat_id AS trove_cat_id
-		FROM trove_cat,trove_group_link
-		WHERE trove_cat.trove_cat_id=trove_group_link.trove_cat_id
-		AND trove_group_link.group_id='$group_id'
-		ORDER BY trove_cat.fullpath");
-
-	$return = '';
-	if (db_numrows($res_trovecat) < 1) {
-		$return .= _('This project has not yet categorized itself in the').' '
-			.util_make_link ('/softwaremap/trove_list.php',_('Trove Software Map'))
-			.'<p />';
-	} else {
-		$return .= '<ul>';
-		$need_close_ul_tag = 1;
-	}
-
-	while ($row_trovecat = db_fetch_array($res_trovecat)) {
-		$return .= '<li>';
-		$folders = explode(" :: ",$row_trovecat['fullpath']);
-		$folders_ids = explode(" :: ",$row_trovecat['fullpath_ids']);
-		$folders_len = count($folders);
-		// if first in discrim print root category
-		for ($i=0;$i<$folders_len;$i++)
-		{
-			$return .= '<a href="/softwaremap/trove_list.php?form_cat='.$folders_ids[$i].$discrim_url.'">'.$folders[$i].'</a>';
-			if ($i != $folders_len-1)
-			{
-				$return .= " : ";
-			}
-		}
-		$return .= '</li>';
-	}
-	if (isset($need_close_ul_tag) && $need_close_ul_tag)
-	{
-		$return .= '</ul>';
-	}
-	return $return;
-}
-
-/**
  * trove_getfullname() - Returns cat fullname
  *
  * @param		int		The node

Modified: trunk/gforge/www/project/admin/project_admin_utils.php
===================================================================
--- trunk/gforge/www/project/admin/project_admin_utils.php	2009-03-19 09:34:04 UTC (rev 7194)
+++ trunk/gforge/www/project/admin/project_admin_utils.php	2009-03-19 14:53:13 UTC (rev 7195)
@@ -74,7 +74,9 @@
 	if($GLOBALS['sys_use_project_database']) {
 		$labels[] = _('Database Admin');
 	}
-	$labels[] = _('Stats');
+	if ($project->usesStats()) {
+		$labels[] = _('Stats');
+	}
 	plugin_hook("quota_label_project_admin");
 	
 	//$links[] = '/project/admin/?group_id='.$group_id;

Modified: trunk/gforge/www/softwaremap/trove_list.php
===================================================================
--- trunk/gforge/www/softwaremap/trove_list.php	2009-03-19 09:34:04 UTC (rev 7194)
+++ trunk/gforge/www/softwaremap/trove_list.php	2009-03-19 14:53:13 UTC (rev 7195)
@@ -294,14 +294,17 @@
 		// extra description
 		print '</span></td></tr><tr valign="top"><td>';
 		// list all trove categories
-		print trove_getcatlisting($row_grp['group_id'],1,0);
-
-		print '</span></td>'."\n".'<td style="text-align:right">'; // now the right side of the display
-		print 'Activity Percentile: <strong>'. number_format($row_grp['percentile'],2) .'</strong>';
-		print '<br />Activity Ranking: <strong>'. number_format($row_grp['ranking'],2) .'</strong>';
-		print '<br />Register Date: <strong>'.date(_('Y-m-d H:i'),$row_grp['register_time']).'</strong>';
-		print '</span></td></tr>';
-                print '</table>';
+		print trove_getcatlisting($row_grp['group_id'],1,0,1);
+		print '</span></td>'."\n";
+		print '<td style="text-align:right">'; // now the right side of the display
+		if (group_get_object($row_grp['group_id'])->usesStats()) {
+			print _('Activity Percentile:&nbsp;').'<strong>'. number_format($row_grp['percentile'],2) .'</strong>';
+			print '<br />'._('Activity Ranking:&nbsp;').' <strong>'. number_format($row_grp['ranking'],2) .'</strong>';
+		}
+		print '<br />'._('Registered:&nbsp;').' <strong>'.date(_('Y-m-d H:i'),$row_grp['register_time']).'</strong>';
+		print '</span></td>';
+		print '</tr>';
+		print '</table>';
 		print '<hr />';
 	} // end if for row and range chacking
 }




More information about the Fusionforge-commits mailing list