[Fusionforge-commits] FusionForge branch master updated. v6.0.5-2085-g7da161a

[Franck Villaume]

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  7da161a3abbf0ab8579247f9c5061cdb9e383b17 (commit)
      from  b4c00f357e05098e0e204de71ae7c227d30654db (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=7da161a3abbf0ab8579247f9c5061cdb9e383b17

commit 7da161a3abbf0ab8579247f9c5061cdb9e383b17
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date:   Thu Aug 10 14:37:18 2017 +0000

    make artifact_extra_detail compat with Widget display

diff --git a/src/plugins/scmhook/library/scmcvs/commitTracker.class.php 
b/src/plugins/scmhook/library/scmcvs/commitTracker.class.php
index 53e2ced..b494e54 100644
--- a/src/plugins/scmhook/library/scmcvs/commitTracker.class.php
+++ b/src/plugins/scmhook/library/scmcvs/commitTracker.class.php
@@ -53,14 +53,19 @@ class CVSCommitTracker extends scmhook {
                return $this->disabledMessage;
        }
 
-       function artifact_extra_detail($params) {
+       function artifact_extra_detail(&$params) {
                global $HTML;
                $DBResult = db_query_params('SELECT * FROM 
plugin_scmhook_scmcvs_committracker_data_master dm, 
plugin_scmhook_scmcvs_committracker_data_artifact da
                                        WHERE da.group_artifact_id = $1 AND 
dm.holder_id = da.id ORDER BY cvs_date desc', array($params['artifact_id']));
                if (!$DBResult) {
-                       echo $HTML->error_msg(_('Unable to retrieve data'));
+                       $return = $HTML->error_msg(_('Unable to retrieve 
data'));
                } else {
-                       $this->getCommitEntries($DBResult, $params['group_id']);
+                       $return = $this->getCommitEntries($DBResult, 
$params['group_id']);
+               }
+               if (isset($params['content'])) {
+                       $params['content'] .= $return;
+               } else {
+                       echo $return;
                }
        }
 
@@ -93,7 +98,7 @@ class CVSCommitTracker extends scmhook {
                        $return .= html_e('h2', array(), _('Related CVS 
commits'), false);
 
                        $title_arr = $this->getTitleArr();
-                       echo $HTML->listTableTop($title_arr);
+                       $return .= $HTML->listTableTop($title_arr);
 
                        while ($Row = db_fetch_array($DBResult)) {
                                $cells = array();

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/scmhook/library/scmcvs/commitTracker.class.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge

_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits