[Fusionforge-commits] r12192 - in trunk/src: db www/activity

Franck VILLAUME nerville at libremir.placard.fr.eu.org
Tue Feb 8 11:21:44 CET 2011


Author: nerville
Date: 2011-02-08 11:21:43 +0100 (Tue, 08 Feb 2011)
New Revision: 12192

Modified:
   trunk/src/db/20110211-docman-activityvw.sql
   trunk/src/www/activity/index.php
Log:
fix activity_vw and remove Commits in activity : should be implemented by plugin using activity hook call

Modified: trunk/src/db/20110211-docman-activityvw.sql
===================================================================
--- trunk/src/db/20110211-docman-activityvw.sql	2011-02-08 08:33:36 UTC (rev 12191)
+++ trunk/src/db/20110211-docman-activityvw.sql	2011-02-08 10:21:43 UTC (rev 12192)
@@ -1,4 +1,38 @@
 DROP VIEW activity_vw;
+
 CREATE VIEW activity_vw AS
-    ((((SELECT agl.group_id, 'trackeropen'::text AS section, agl.group_artifact_id AS ref_id, a.artifact_id AS subref_id, a.summary AS description, a.open_date AS activity_date, u.user_id, u.user_name, u.realname FROM (artifact_group_list agl JOIN artifact a USING (group_artifact_id)), users u WHERE (u.user_id = a.submitted_by) UNION SELECT agl.group_id, 'trackerclose'::text AS section, agl.group_artifact_id AS ref_id, a.artifact_id AS subref_id, a.summary AS description, a.close_date AS activity_date, u.user_id, u.user_name, u.realname FROM (artifact_group_list agl JOIN artifact a USING (group_artifact_id)), users u WHERE ((u.user_id = a.assigned_to) AND (a.close_date > 0))) UNION SELECT agl.group_id, 'commit'::text AS section, agl.group_artifact_id AS ref_id, a.artifact_id AS subref_id, pcdm.log_text AS description, pcdm.cvs_date AS activity_date, u.user_id, u.user_name, u.realname FROM (artifact_group_list agl JOIN artifact a USING (group_artifact_id)), plugin_cvstracker_data_master pcdm, plugin_cvstracker_data_artifact pcda, users u WHERE (((pcdm.holder_id = pcda.id) AND (pcda.group_artifact_id = a.artifact_id)) AND (u.user_name = pcdm.author))) UNION SELECT frsp.group_id, 'frsrelease'::text AS section, frsp.package_id AS ref_id, frsr.release_id AS subref_id, frsr.name AS description, frsr.release_date AS activity_date, u.user_id, u.user_name, u.realname FROM (frs_package frsp JOIN frs_release frsr USING (package_id)), users u WHERE (u.user_id = frsr.released_by)) UNION SELECT fgl.group_id, 'forumpost'::text AS section, fgl.group_forum_id AS ref_id, forum.msg_id AS subref_id, forum.subject AS description, forum.post_date AS activity_date, u.user_id, u.user_name, u.realname FROM (forum_group_list fgl JOIN forum USING (group_forum_id)), users u WHERE (u.user_id = forum.posted_by)) UNION select group_id, 'docmannew'::text AS section, doc_group AS ref_id, docid AS subref_id, filename AS description, createdate AS activity_date, created_by as user_id , user_name, realname FROM docdata_vw;
+SELECT
+agl.group_id, 'trackeropen'::text AS section, agl.group_artifact_id AS ref_id,
+a.artifact_id as subref_id, a.summary as description, a.open_date AS activity_date, u.user_id, u.user_name, u.realname
+FROM artifact_group_list agl JOIN artifact a using (group_artifact_id),
+users u WHERE u.user_id=a.submitted_by
+UNION
+SELECT
+agl.group_id, 'trackerclose'::text AS section, agl.group_artifact_id AS ref_id,
+a.artifact_id as subref_id, a.summary as description, a.close_date AS activity_date, u.user_id, u.user_name, u.realname
+FROM artifact_group_list agl JOIN artifact a using (group_artifact_id), users u WHERE u.user_id=a.assigned_to
+--actually should join against  
+AND a.close_date > 0
+UNION
+SELECT
+frsp.group_id, 'frsrelease'::text as section,frsp.package_id as ref_id,
+frsr.release_id as subref_id, frsr.name AS description, frsr.release_date AS activity_date,
+u.user_id, u.user_name, u.realname FROM frs_package frsp JOIN frs_release frsr USING (package_id), users u WHERE
+u.user_id=frsr.released_by
+UNION
+SELECT
+fgl.group_id, 'forumpost'::text as section,fgl.group_forum_id as ref_id, forum.msg_id
+as subref_id, forum.subject AS description, forum.post_date AS activity_date, u.user_id,
+u.user_name, u.realname FROM forum_group_list fgl JOIN forum USING (group_forum_id), users u WHERE
+u.user_id=forum.posted_by
+UNION
+SELECT group_id, 'docmannew'::text AS section, doc_group AS ref_id, docid AS subref_id,
+filename AS description, createdate AS activity_date, created_by as user_id,
+user_name, realname FROM docdata_vw
+UNION
+SELECT group_id, 'docmanupdate'::text AS section, doc_group AS ref_id, docid AS subref_id,
+filename AS description, updatedate AS activity_date, created_by as user_id,
+user_name, realname FROM docdata_vw
+;
 
+

Modified: trunk/src/www/activity/index.php
===================================================================
--- trunk/src/www/activity/index.php	2011-02-08 08:33:36 UTC (rev 12191)
+++ trunk/src/www/activity/index.php	2011-02-08 10:21:43 UTC (rev 12192)
@@ -103,11 +103,6 @@
 	$texts[]	= _('News');
 }
 
-if (forge_get_config('use_scm') && $group->usesSCM()) {
-	$ids[]		= 'commit';
-	$texts[]	= _('Commits');
-}
-
 if (forge_get_config('use_frs') && $group->usesFRS()) {
 	$ids[]		= 'frsrelease';
 	$texts[]	= _('FRS Release');




More information about the Fusionforge-commits mailing list