[Fusionforge-commits] FusionForge branch master updated. 4d1a6f318ab858bb5db8a3295b8d7c2455d0c9e4
Benoît Debaenst
tiben at fusionforge.org
Sat Feb 15 17:25:25 CET 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 4d1a6f318ab858bb5db8a3295b8d7c2455d0c9e4 (commit)
from 079e2f666498bc5436a0f79125df655e115bf1e9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4d1a6f318ab858bb5db8a3295b8d7c2455d0c9e4
Author: tiben <benoit.debaenst at trivialdev.com>
Date: Sat Feb 15 16:03:46 2014 +0000
[#630] add pm in activity
diff --git a/src/db/20140215-task-activityvw.sql b/src/db/20140215-task-activityvw.sql
new file mode 100644
index 0000000..d53cef1
--- /dev/null
+++ b/src/db/20140215-task-activityvw.sql
@@ -0,0 +1,63 @@
+
+CREATE OR REPLACE 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
+--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
+UNION
+SELECT doc_groups.group_id, 'docgroupnew'::text AS section, doc_groups.parent_doc_group AS ref_id, doc_groups.doc_group AS subref_id,
+doc_groups.groupname AS description, doc_groups.createdate AS activity_date, doc_groups.created_by as user_id,
+users.user_name, users.realname FROM doc_groups, users WHERE doc_groups.created_by = users.user_id
+UNION
+SELECT news_bytes.group_id,'news' AS section,news_bytes.id AS ref_id,news_bytes.forum_id AS subref_id,
+news_bytes.summary AS description, news_bytes.post_date AS activity_date, u.user_id, u.user_name, u.realname
+FROM news_bytes, users u WHERE u.user_id = news_bytes.submitted_by
+UNION
+SELECT pgl.group_id, 'taskopen'::text AS section, p.group_project_id AS ref_id,
+p.project_task_id AS subref_id, p.summary AS description, p.last_modified_date AS activity_date,
+u.user_id, u.user_name, u.realname
+FROM project_task p
+JOIN project_group_list pgl USING (group_project_id), users u
+WHERE u.user_id = p.created_by AND p.status_id = 1
+UNION
+SELECT pgl.group_id, 'taskclose'::text AS section, p.group_project_id AS ref_id,p.project_task_id AS subref_id,
+p.summary AS description, p.last_modified_date AS activity_date, u.user_id,
+u.user_name, u.realname
+FROM project_task p
+JOIN project_group_list pgl USING (group_project_id), users u
+WHERE u.user_id = p.created_by AND p.status_id = 2
+UNION
+SELECT pgl.group_id, 'taskdelete'::text AS section, p.group_project_id AS ref_id,
+p.project_task_id AS subref_id, p.summary AS description, p.last_modified_date AS activity_date,
+u.user_id, u.user_name, u.realname
+FROM project_task p
+JOIN project_group_list pgl USING (group_project_id), users u
+WHERE u.user_id = p.created_by AND p.status_id = 3;
diff --git a/src/www/activity/index.php b/src/www/activity/index.php
index 28198ac..4cfb794 100644
--- a/src/www/activity/index.php
+++ b/src/www/activity/index.php
@@ -7,6 +7,7 @@
* Copyright 2010-2011, Franck Villaume - Capgemini
* Copyright 2012-2014, Franck Villaume - TrivialDev
* Copyright (C) 2012 Alain Peyrat - Alcatel-Lucent
+ * Copyright 2014, Benoit Debaenst - TrivialDev
* http://fusionforge.org/
*
* This file is part of FusionForge. FusionForge is free software;
@@ -114,6 +115,15 @@ if (forge_get_config('use_news') && $group->usesNews()) {
$texts[] = _('News');
}
+if (forge_get_config('use_pm') && $group->usesPM()) {
+ $ids[] = 'taskopen';
+ $texts[] = _('Tasks Opened');
+ $ids[] = 'taskclose';
+ $texts[] = _('Tasks Closed');
+ $ids[] = 'taskdelete';
+ $texts[] = _('Tasks Deleted');
+}
+
if (forge_get_config('use_frs') && $group->usesFRS()) {
$ids[] = 'frsrelease';
$texts[] = _('FRS Release');
@@ -219,7 +229,6 @@ if (count($results) < 1) {
$cached_perms[$s][$ref] = forge_check_perm('scm', $group_id, 'read');
break;
}
- case 'commit':
case 'trackeropen':
case 'trackerclose': {
$cached_perms[$s][$ref] = forge_check_perm('tracker', $ref, 'read');
@@ -234,6 +243,12 @@ if (count($results) < 1) {
$cached_perms[$s][$ref] = forge_check_perm('forum', $ref, 'read');
break;
}
+ case 'taskopen':
+ case 'taskclose':
+ case 'taskdelete': {
+ $cached_perms[$s][$ref] = forge_check_perm('pm', $ref, 'read');
+ break;
+ }
case 'docmannew':
case 'docmanupdate':
case 'docgroupnew': {
@@ -276,48 +291,58 @@ if (count($results) < 1) {
}
switch (@$arr['section']) {
case 'scm': {
- $icon = html_image('ic/cvs16b.png','','',array('alt'=>'Source Code'));
+ $icon = html_image('ic/cvs16b.png','','',array('alt'=>_('Source Code')));
$url = util_make_link('/scm/'.$arr['ref_id'].$arr['subref_id'],_('scm commit: ').$arr['description']);
break;
}
- case 'commit': {
- $icon = html_image('ic/cvs16b.png','','',array('alt'=>'Source Code'));
- $url = util_make_link('/tracker/?func=detail&atid='.$arr['ref_id'].'&aid='.$arr['subref_id'].'&group_id='.$arr['group_id'],_('Commit for Tracker Item').' [#'.$arr['subref_id'].'] '.$arr['description']);
- break;
- }
case 'trackeropen': {
- $icon = html_image('ic/tracker20g.png','','',array('alt'=>'Trackers'));
+ $icon = html_image('ic/tracker20g.png','','',array('alt'=>_('Trackers')));
$url = util_make_link('/tracker/?func=detail&atid='.$arr['ref_id'].'&aid='.$arr['subref_id'].'&group_id='.$arr['group_id'],_('Tracker Item').' [#'.$arr['subref_id'].'] '.$arr['description'].' '._('Opened'));
break;
}
case 'trackerclose': {
- $icon = html_image('ic/tracker20g.png','','',array('alt'=>'Trackers'));
+ $icon = html_image('ic/tracker20g.png','','',array('alt'=>_('Trackers')));
$url = util_make_link('/tracker/?func=detail&atid='.$arr['ref_id'].'&aid='.$arr['subref_id'].'&group_id='.$arr['group_id'],_('Tracker Item').' [#'.$arr['subref_id'].'] '.$arr['description'].' '._('Closed'));
break;
}
case 'frsrelease': {
- $icon = html_image('ic/cvs16b.png','','',array('alt'=>'Files'));
+ $icon = html_image('ic/cvs16b.png','','',array('alt'=>_('Files')));
$url = util_make_link('/frs/?release_id='.$arr['subref_id'].'&group_id='.$arr['group_id'],_('FRS Release').' '.$arr['description']);
break;
}
case 'forumpost': {
- $icon = html_image('ic/forum20g.png','','',array("alt"=>'Forum'));
+ $icon = html_image('ic/forum20g.png','','',array("alt"=>_('Forum')));
$url = util_make_link('/forum/message.php?msg_id='.$arr['subref_id'].'&group_id='.$arr['group_id'],_('Forum Post ').' '.$arr['description']);
break;
}
case 'news': {
- $icon = html_image('ic/write16w.png','','',array('alt'=>'News'));
+ $icon = html_image('ic/write16w.png','','',array('alt'=>_('News')));
$url = util_make_link('/forum/forum.php?forum_id='.$arr['subref_id'],_('News').' '.$arr['description']);
break;
}
+ case 'taskopen': {
+ $icon = html_image('ic/write16w.png','','',array('alt'=>_('Tasks')));
+ $url = util_make_link('/pm/task.php?func=detailtask&project_task_id='.$arr['subref_id'].'&group_id='.$arr['group_id'].'&group_project_id='.$arr['ref_id'],_('Tasks').' '.$arr['description']);
+ break;
+ }
+ case 'taskclose': {
+ $icon = html_image('ic/write16w.png','','',array('alt'=>_('Tasks')));
+ $url = util_make_link('/pm/task.php?func=detailtask&project_task_id='.$arr['subref_id'].'&group_id='.$arr['group_id'].'&group_project_id='.$arr['ref_id'],_('Tasks').' '.$arr['description']);
+ break;
+ }
+ case 'taskdelete': {
+ $icon = html_image('ic/write16w.png','','',array('alt'=>_('Tasks')));
+ $url = util_make_link('/pm/task.php?func=detailtask&project_task_id='.$arr['subref_id'].'&group_id='.$arr['group_id'].'&group_project_id='.$arr['ref_id'],_('Tasks').' '.$arr['description']);
+ break;
+ }
case 'docmannew':
case 'docmanupdate': {
- $icon = html_image("ic/docman16b.png", '', '', array("alt"=>"Documents"));
+ $icon = html_image('ic/docman16b.png', '', '', array('alt'=>_('Documents')));
$url = util_make_link('docman/?group_id='.$arr['group_id'].'&view=listfile&dirid='.$arr['ref_id'],_('Document').' '.$arr['description']);
break;
}
case 'docgroupnew': {
- $icon = html_image("ic/cfolder15.png", '', '', array("alt"=>"Directory"));
+ $icon = html_image('ic/cfolder15.png', '', '', array("alt"=>_('Directory')));
$url = util_make_link('docman/?group_id='.$arr['group_id'].'&view=listfile&dirid='.$arr['subref_id'],_('Directory').' '.$arr['description']);
break;
}
-----------------------------------------------------------------------
Summary of changes:
...statistics.sql => 20140215-task-activityvw.sql} | 30 ++++++++---
src/www/activity/index.php | 53 ++++++++++++++------
2 files changed, 62 insertions(+), 21 deletions(-)
copy src/db/{20120714-docman-docdata-statistics.sql => 20140215-task-activityvw.sql} (69%)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list