[evolvis-commits] r9015: Applied patch [ #490 ] Deleted projects can appear inside the ' Most Active this week' section↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 16:57:38 CET 2011


Author: mirabilos
Date: 2011-02-24 16:57:38 +0100 (Thu, 24 Feb 2011)
New Revision: 9015

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog
   trunk/gforge_base/evolvisforge-5.1/gforge/www/include/features_boxes.php
Log:
Applied patch [ #490 ] Deleted projects can appear inside the 'Most Active this week' section


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog	2011-02-24 15:57:37 UTC (rev 9014)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog	2011-02-24 15:57:38 UTC (rev 9015)
@@ -2,6 +2,10 @@
 
 	* common/include/Group.class:
 	Fixed bug [ #494 ] "Project Approved" don't send e-mail
+
+	* www/include/features_boxes.php
+	Applied patch [ #490 ] Deleted projects can appear inside 
+	the "Most Active this week" section
 	
 2003-08-22  Roland Mas  <99.roland.mas at aist.enst.fr>
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/include/features_boxes.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/include/features_boxes.php	2011-02-24 15:57:37 UTC (rev 9014)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/include/features_boxes.php	2011-02-24 15:57:38 UTC (rev 9015)
@@ -136,7 +136,7 @@
 	//select out the users information to show the top users on the site
 	$sql="SELECT users.user_name,users.realname,user_metric.metric
 		FROM user_metric,users
-		WHERE users.user_id=user_metric.user_id AND user_metric.ranking < 11
+		WHERE users.user_id=user_metric.user_id AND user_metric.ranking < 11 AND users.status != 'D'  
 		ORDER BY ranking ASC";
 	$res=db_query($sql);
 	$rows=db_numrows($res);
@@ -158,7 +158,8 @@
 		"FROM groups,project_weekly_metric ".
 		"WHERE groups.group_id=project_weekly_metric.group_id ".
 		"AND groups.is_public=1 ".
-		"AND groups.type=1 ".
+		"AND groups.type=1  ".
+		"AND groups.status != 'D'  ".
 		"ORDER BY ranking ASC";
 	$result=db_query($sql,20);
 	if (!$result || db_numrows($result) < 1) {



More information about the evolvis-commits mailing list