[Fusionforge-commits] r13590 - branches/Branch_5_1/src/cronjobs

Roland Mas lolando at fusionforge.org
Mon Jun 27 17:51:53 CEST 2011


Author: lolando
Date: 2011-06-27 17:51:53 +0200 (Mon, 27 Jun 2011)
New Revision: 13590

Modified:
   branches/Branch_5_1/src/cronjobs/db_trove_maint.php
Log:
Stop using groups.is_public in db_trove_maint.php, fixing [#309]

Modified: branches/Branch_5_1/src/cronjobs/db_trove_maint.php
===================================================================
--- branches/Branch_5_1/src/cronjobs/db_trove_maint.php	2011-06-27 15:33:45 UTC (rev 13589)
+++ branches/Branch_5_1/src/cronjobs/db_trove_maint.php	2011-06-27 15:51:53 UTC (rev 13590)
@@ -42,13 +42,16 @@
 db_query_params ('INSERT INTO trove_agg
 (SELECT tgl.trove_cat_id, g.group_id, g.group_name, g.unix_group_name, g.status, g.register_time, g.short_description, project_weekly_metric.percentile, project_weekly_metric.ranking
 FROM groups g
-LEFT JOIN project_weekly_metric USING (group_id), trove_group_link tgl
+LEFT JOIN project_weekly_metric USING (group_id), trove_group_link tgl, pfo_role_setting prs
 WHERE tgl.group_id=g.group_id
-AND g.is_public = 1
 AND g.type_id = 1
 AND g.status = $1
+AND g.group_id = prs.ref_id
+AND prs.section_name = $2
+AND prs.role_id = 1
 ORDER BY trove_cat_id ASC, ranking ASC)',
-		 array('A'));
+		 array('A',
+		       'project_read'));
 $err .= db_error();
 
 db_commit();
@@ -87,12 +90,16 @@
 	FROM  trove_cat LEFT JOIN trove_group_link ON
 		trove_cat.trove_cat_id=trove_group_link.trove_cat_id
 	LEFT JOIN groups ON
-		groups.group_id=trove_group_link.group_id
+		groups.group_id=trove_group_link.group_id,
+        pfo_role_setting prs
 	WHERE (groups.status=$1 OR groups.status IS NULL)
 	AND (groups.type_id=1 OR groups.status IS NULL)
-	AND (groups.is_public=1 OR groups.is_public IS NULL)
+	AND groups.group_id = prs.ref_id
+	AND prs.section_name = $2
+	AND prs.role_id = 1
 	GROUP BY trove_cat.trove_cat_id,trove_cat.parent',
-			array('A'));
+			array('A',
+				'project_read'));
 
 $rows = db_numrows($res);
 




More information about the Fusionforge-commits mailing list