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.1 has been updated
via a7ca690eb2fed6c2e96661f89fdf46cdbb062325 (commit)
via 7bc3a8c0021f00eed1c4de68500f1b6a7cc5e1b6 (commit)
from 93fca65a2172f279c4459b58f2e9cc99cfba0afa (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=a7ca690eb2fed6c2e96661f89fdf46cdbb062325
commit a7ca690eb2fed6c2e96661f89fdf46cdbb062325
Author: Franck Villaume <[email protected]>
Date: Tue Jul 3 19:30:40 2018 +0200
fix hook activiy call in report. use group_id, not group
diff --git a/src/common/reporting/report_utils.php
b/src/common/reporting/report_utils.php
index d29202e..146fcbc 100644
--- a/src/common/reporting/report_utils.php
+++ b/src/common/reporting/report_utils.php
@@ -153,7 +153,6 @@ function report_area_box($name='area', $selected='1',
$Group=false) {
}
if (is_object($Group) && $Group->getID()) {
- $hookParams['group'] = $Group->getID();
$hookParams['group_id'] = $Group->getID();
$hookParams['show'] = array('none'); // No display => No
compute this time.
$hookParams['ids'] = &$arr;
@@ -709,7 +708,7 @@ function report_actgraph($type, $SPAN, $start, $end, $id,
$area) {
$texts = array();
$show[] = $area;
- $hookParams['group'] = $id;
+ $hookParams['group_id'] = $id;
$hookParams['results'] = &$results;
$hookParams['show'] = &$show;
$hookParams['begin'] = $start;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=7bc3a8c0021f00eed1c4de68500f1b6a7cc5e1b6
commit 7bc3a8c0021f00eed1c4de68500f1b6a7cc5e1b6
Author: Franck Villaume <[email protected]>
Date: Tue Jul 3 19:30:07 2018 +0200
space
diff --git a/src/www/project/stats/index.php b/src/www/project/stats/index.php
index e82d0e4..6dc7e42 100644
--- a/src/www/project/stats/index.php
+++ b/src/www/project/stats/index.php
@@ -47,7 +47,7 @@ if (!$group || !is_object($group)) {
exit_error($group->getErrorMessage(),'admin');
}
-$report=new Report();
+$report = new Report();
if ($report->isError()) {
exit_error($report->getErrorMessage(),'admin');
}
@@ -91,8 +91,7 @@ html_use_jqueryjqplotpluginhighlighter();
html_use_jqueryjqplotplugindateAxisRenderer();
html_use_jqueryjqplotpluginBar();
-project_admin_header(array('title'=>sprintf(_('Project Statistics for %s'),
$group->getPublicName()),
- 'group'=>$group_id));
+project_admin_header(array('title'=>sprintf(_('Project Statistics for %s'),
$group->getPublicName()), 'group'=>$group_id));
//
// BEGIN PAGE CONTENT CODE
-----------------------------------------------------------------------
Summary of changes:
src/common/reporting/report_utils.php | 3 +--
src/www/project/stats/index.php | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
