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, 6.0 has been updated
via 9dac33977dad721cf6f252b7892ae90f22f61a6f (commit)
via 7e9d6bc7f6c7ee8a67dfc5f99d60b6b39967e193 (commit)
from e76bc193f2c1dad976d82a2eaad771f9531e2e10 (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=9dac33977dad721cf6f252b7892ae90f22f61a6f
commit 9dac33977dad721cf6f252b7892ae90f22f61a6f
Merge: e76bc19 7e9d6bc
Author: Franck Villaume <[email protected]>
Date: Wed Jul 29 11:46:45 2015 +0200
Merge Branch_5_3
diff --cc src/common/widget/Widget_MyMonitoredForums.class.php
index 17dd0d8,8e2f925..ce1028b
--- a/src/common/widget/Widget_MyMonitoredForums.class.php
+++ b/src/common/widget/Widget_MyMonitoredForums.class.php
@@@ -1,7 -1,7 +1,7 @@@
<?php
/**
* Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights
reserved
- * Copyright 2012-2014, Franck Villaume - TrivialDev
- * Copyright 2012-2013, Franck Villaume - TrivialDev
++ * Copyright 2012-2015, Franck Villaume - TrivialDev
* Copyright (C) 2014 Alain Peyrat - Alcatel-Lucent
*
* This file is a part of FusionForge.
@@@ -40,24 -39,58 +40,24 @@@ class Widget_MyMonitoredForums extends
}
function getContent() {
+ global $HTML;
$html_my_monitored_forums = '';
- $sql="SELECT DISTINCT groups.group_id, groups.group_name,
- forum_group_list.group_forum_id,
forum_group_list.forum_name ".
- "FROM groups,forum_group_list,forum_monitored_forums ".
- "WHERE groups.group_id=forum_group_list.group_id ".
- "AND groups.status = 'A' ".
- "AND
forum_group_list.group_forum_id=forum_monitored_forums.forum_id ".
- "AND forum_monitored_forums.user_id=$1 ";
- $um = UserManager::instance();
- $current_user = $um->getCurrentUser();
- if ($current_user->getStatus()=='S') {
- $projects = $current_user->getProjects();
- $sql .= "AND groups.group_id IN (". implode(',',
$projects) .") ";
- }
- //$sql .= "GROUP BY groups.group_id ORDER BY groups.group_id
ASC LIMIT 100";
- $sql .= "ORDER BY groups.group_id ASC LIMIT 100";
-
- $result=db_query_params($sql,array(user_getid()));
- $glist = array();
- while ($r = db_fetch_array($result)) {
- if (forge_check_perm('project_read', $r['group_id'])
- && forge_check_perm('forum',
$r['group_forum_id'], 'read')) {
- $glist[] = serialize(array($r['group_id'],
$r['group_name']));
- }
- }
- $glist = array_unique($glist);
- $rows=count($glist);
- if (!$result || $rows < 1) {
- $html_my_monitored_forums .= '<div class="warning">' .
_("You are not monitoring any forums.") . '</div><p>' . _("If you monitor
forums, you will be sent new posts in the form of an email, with a link to the
new message.") . '</p><p>' . _("You can monitor forums by clicking on the
appropriate menu item in the discussion forum itself.") . '</p>';
+ $monitorElementObject = new MonitorElement('forum');
+ $distinctMonitorGroupIdsArray =
$monitorElementObject->getMonitoredDistinctGroupIdsByUserIdInArray(user_getid());
+ if (!$distinctMonitorGroupIdsArray ||
count($distinctMonitorGroupIdsArray) < 1) {
+ $html_my_monitored_forums .= $HTML->warning_msg(_('You
are not monitoring any forums.')).html_e('p', array(), _("If you monitor
forums, you will be sent new posts in the form of an email, with a link to the
new message.")).html_e('p', array(), _("You can monitor forums by clicking on
the appropriate menu item in the discussion forum itself."));
} else {
- $request =& HTTPRequest::instance();
- $html_my_monitored_forums .= '<table
style="width:100%">';
- foreach ($glist as $group) {
- list($group_id, $group_name) =
unserialize($group);
-
- $sql2="SELECT
forum_group_list.group_forum_id,forum_group_list.forum_name ".
- "FROM
groups,forum_group_list,forum_monitored_forums ".
- "WHERE
groups.group_id=forum_group_list.group_id ".
- "AND groups.group_id=$1".
- "AND
forum_group_list.group_forum_id=forum_monitored_forums.forum_id ".
- "AND forum_monitored_forums.user_id=$2
LIMIT 100";
-
- $result2 = db_query_params($sql2,
array($group_id, user_getid()));
- $flist = array();
- while ($r = db_fetch_array($result2)) {
- if (forge_check_perm('forum',
$r['group_forum_id'], 'read')) {
- $flist[] = $r;
- }
+ $validDistinctMonitorGroupIdsArray = array();
+ foreach ($distinctMonitorGroupIdsArray as
$distinctMonitorGroupId) {
- if (forge_check_perm('forum_admin',
$distinctMonitorGroupId, 'read')) {
++ if (forge_check_perm('project_read',
$distinctMonitorGroupId)) {
+ $validDistinctMonitorGroupIdsArray[] =
$distinctMonitorGroupId;
+ } else {
+ // Oh ho! we found some monitored
elements where user has no read access. Let's clean the situation
+
$monitorElementObject->disableMonitoringForGroupIdByUserId($distinctMonitorGroupId,
user_getid());
}
-
- $rows2 = count($flist);
-
+ }
+ if (count($validDistinctMonitorGroupIdsArray)) {
+ $request =& HTTPRequest::instance();
$vItemId = new Valid_UInt('hide_item_id');
$vItemId->required();
if ($request->valid($vItemId)) {
diff --cc src/common/widget/Widget_MyTasks.class.php
index b81904e,a3f1e12..33e9e6a
--- a/src/common/widget/Widget_MyTasks.class.php
+++ b/src/common/widget/Widget_MyTasks.class.php
@@@ -1,7 -1,6 +1,7 @@@
<?php
/**
* Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights
reserved
- * Copyright 2014, Franck Villaume - TrivialDev
++ * Copyright 2014-2015, Franck Villaume - TrivialDev
*
* This file is a part of Fusionforge.
*
@@@ -29,120 -28,122 +29,120 @@@ require_once $gfwww.'include/my_utils.p
* Tasks assigned to me
*/
class Widget_MyTasks extends Widget {
- var $content;
- var $can_be_displayed;
-
- function Widget_MyTasks() {
- $this->Widget('mytasks');
- $this->content = '';
- $this->setOwner(user_getid(), WidgetLayoutManager::OWNER_TYPE_USER);
- $last_group=0;
-
- $sql = 'SELECT groups.group_id, groups.group_name,
project_group_list.group_project_id, project_group_list.project_name '.
- 'FROM groups,project_group_list,project_task,project_assigned_to
'.
- 'WHERE
project_task.project_task_id=project_assigned_to.project_task_id '.
- 'AND project_assigned_to.assigned_to_id=$1'.
- ' AND project_task.status_id=1 AND
project_group_list.group_id=groups.group_id '.
- 'AND
project_group_list.group_project_id=project_task.group_project_id GROUP BY
groups.group_id, groups.group_name, project_group_list.project_name,
project_group_list.group_project_id';
-
- $result=db_query_params($sql,array(user_getid()));
-
- $plist = array();
- while ($r = db_fetch_array($result)) {
- if (forge_check_perm('project_read', $r['group_id'], 'read')
- && forge_check_perm('pm',
$r['group_project_id'], 'read')) {
- $plist[] = $r;
+ var $content;
+ var $can_be_displayed;
+
+ function Widget_MyTasks() {
+ global $HTML;
+ $this->Widget('mytasks');
+ $this->content = '';
+ $this->setOwner(user_getid(),
WidgetLayoutManager::OWNER_TYPE_USER);
+
+ $sql = 'SELECT groups.group_id, groups.group_name,
project_group_list.group_project_id, project_group_list.project_name '.
+ 'FROM
groups,project_group_list,project_task,project_assigned_to '.
+ 'WHERE
project_task.project_task_id=project_assigned_to.project_task_id '.
+ 'AND project_assigned_to.assigned_to_id=$1'.
+ ' AND project_task.status_id=1 AND
project_group_list.group_id=groups.group_id '.
+ 'AND
project_group_list.group_project_id=project_task.group_project_id GROUP BY
groups.group_id, groups.group_name, project_group_list.project_name,
project_group_list.group_project_id';
+
+ $result=db_query_params($sql,array(user_getid()));
+
+ $plist = array();
+ while ($r = db_fetch_array($result)) {
- if (forge_check_perm('project', $r['group_id'], 'read')
++ if (forge_check_perm('project_read', $r['group_id'])
+ && forge_check_perm('pm',
$r['group_project_id'], 'read')) {
+ $plist[] = $r;
+ }
}
+
+ $rows = count($plist);
+
+ if ($result && $rows >= 1) {
+ $request =& HTTPRequest::instance();
+ $this->content .= $HTML->listTableTop();
+ for ($j=0; $j<$rows; $j++) {
+
+ $group_id = $plist[$j]['group_id'];
+ $group_project_id =
$plist[$j]['group_project_id'];
+
+ $sql2 = 'SELECT project_task.project_task_id,
project_task.priority, project_task.summary,project_task.percent_complete '.
+ 'FROM
groups,project_group_list,project_task,project_assigned_to '.
+ 'WHERE
project_task.project_task_id=project_assigned_to.project_task_id '.
+ "AND
project_assigned_to.assigned_to_id=$1 AND project_task.status_id='1' ".
+ 'AND
project_group_list.group_id=groups.group_id '.
+ "AND groups.group_id=$2 ".
+ 'AND
project_group_list.group_project_id=project_task.group_project_id '.
+ "AND
project_group_list.group_project_id= $3 LIMIT 100";
+
+ $result2 =
db_query_params($sql2,array(user_getid(),$group_id,$group_project_id));
+ $rows2 = db_numrows($result2);
+
+ $vItemId = new Valid_UInt('hide_item_id');
+ $vItemId->required();
+ if($request->valid($vItemId)) {
+ $hide_item_id =
$request->get('hide_item_id');
+ } else {
+ $hide_item_id = null;
+ }
+
+ $vPm = new Valid_WhiteList('hide_pm', array(0,
1));
+ $vPm->required();
+ if($request->valid($vPm)) {
+ $hide_pm = $request->get('hide_pm');
+ } else {
+ $hide_pm = null;
+ }
+
+ list($hide_now,$count_diff,$hide_url) =
my_hide_url('pm',$group_project_id,$hide_item_id,$rows2,$hide_pm);
+
+ $html_hdr = '<tr class="boxitem"><td
colspan="3">'.
+
$hide_url.util_make_link('/pm/task.php?group_id='.$group_id.'&group_project_id='.$group_project_id,
+
db_result($result,$j,'group_name').' - '.db_result($result,$j,'project_name'));
+ $html = '';
+ $count_new = max(0, $count_diff);
+ for ($i=0; $i<$rows2; $i++) {
+
+ if (!$hide_now) {
+
+ $html .= '
+ <tr
class="priority'.db_result($result2,$i,'priority').
+ '"><td class="small">'.
+
util_make_link('/pm/task.php/?func=detailtask&project_task_id='.db_result($result2,
$i, 'project_task_id').
+
'&group_id='.$group_id.'&group_project_id='.$group_project_id,
+
stripslashes(db_result($result2,$i,'summary'))).'</td>'.
+ '<td
class="small">'.(db_result($result2,$i,'percent_complete')).'%</td></tr>';
+
+ }
+ }
+
+ $html_hdr .=
my_item_count($rows2,$count_new).'</td></tr>';
+ $this->content .= $html_hdr.$html;
+ }
+ $this->content .= $HTML->listTableBottom();
+ } else {
+ $this->content .= $HTML->warning_msg(_('No task yet'));
+ }
+ }
+ function getTitle() {
+ return _('My Tasks');
}
+ function getContent() {
+ return $this->content;
+ }
+ function isAvailable() {
+ if (!forge_get_config('use_pm')) {
+ return false ;
+ }
- $rows = count($plist);
-
- if ($result && $rows >= 1) {
- $request =& HTTPRequest::instance();
- $this->content .= '<table style="width:100%">';
- for ($j=0; $j<$rows; $j++) {
-
- $group_id = $plist[$j]['group_id'];
- $group_project_id = $plist[$j]['group_project_id'];
-
- $sql2 = 'SELECT project_task.project_task_id,
project_task.priority, project_task.summary,project_task.percent_complete '.
- 'FROM
groups,project_group_list,project_task,project_assigned_to '.
- 'WHERE
project_task.project_task_id=project_assigned_to.project_task_id '.
- "AND project_assigned_to.assigned_to_id=$1 AND
project_task.status_id='1' ".
- 'AND project_group_list.group_id=groups.group_id '.
- "AND groups.group_id=$2 ".
- 'AND
project_group_list.group_project_id=project_task.group_project_id '.
- "AND project_group_list.group_project_id= $3 LIMIT 100";
-
- $result2 =
db_query_params($sql2,array(user_getid(),$group_id,$group_project_id));
- $rows2 = db_numrows($result2);
-
- $vItemId = new Valid_UInt('hide_item_id');
- $vItemId->required();
- if($request->valid($vItemId)) {
- $hide_item_id = $request->get('hide_item_id');
- } else {
- $hide_item_id = null;
- }
-
- $vPm = new Valid_WhiteList('hide_pm', array(0, 1));
- $vPm->required();
- if($request->valid($vPm)) {
- $hide_pm = $request->get('hide_pm');
- } else {
- $hide_pm = null;
- }
-
- list($hide_now,$count_diff,$hide_url) =
my_hide_url('pm',$group_project_id,$hide_item_id,$rows2,$hide_pm);
-
- $html_hdr = '<tr class="boxitem"><td colspan="3">'.
- $hide_url.'<a href="/pm/task.php?group_id='.$group_id.
- '&group_project_id='.$group_project_id.'">'.
- db_result($result,$j,'group_name').' - '.
- db_result($result,$j,'project_name').'</a> ';
- $html = '';
- $count_new = max(0, $count_diff);
- for ($i=0; $i<$rows2; $i++) {
-
- if (!$hide_now) {
-
- $html .= '
- <tr class="priority'.db_result($result2,$i,'priority').
- '"><td class="small"><a
href="/pm/task.php/?func=detailtask&project_task_id='.
- db_result($result2, $i,
'project_task_id').'&group_id='.
- $group_id.'&group_project_id='.$group_project_id.
-
'">'.stripslashes(db_result($result2,$i,'summary')).'</a></td>'.
- '<td
class="small">'.(db_result($result2,$i,'percent_complete')).'%</td></tr>';
-
- }
- }
-
- $html_hdr .= my_item_count($rows2,$count_new).'</td></tr>';
- $this->content .= $html_hdr.$html;
- }
- $this->content .= '</table>';
- } else {
- $this->content .= '<div class="warning">'. _("No task yet")
.'</div>';
- }
- }
- function getTitle() {
- return _("My Tasks");
- }
- function getContent() {
- return $this->content;
- }
- function isAvailable() {
- if (!forge_get_config('use_pm')) {
- return false ;
- }
-
- foreach
(UserManager::instance()->getCurrentUser()->getGroups(false) as $p) {
- if ($p->usesPM()) {
- return true ;
- }
- }
- return false ;
- }
-
- function getDescription() {
- return _("List the tasks assigned to you.");
- }
+ foreach
(UserManager::instance()->getCurrentUser()->getGroups(false) as $p) {
+ if ($p->usesPM()) {
+ return true ;
+ }
+ }
+ return false ;
+ }
+
+ function getDescription() {
+ return _('List the tasks assigned to you.');
+ }
}
-----------------------------------------------------------------------
Summary of changes:
src/common/widget/Widget_MyMonitoredForums.class.php | 4 ++--
src/common/widget/Widget_MyTasks.class.php | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
