[Fusionforge-commits] FusionForge branch master updated. v6.0.5-2185-geb5c286

Franck Villaume nerville at libremir.placard.fr.eu.org
Mon Sep 18 11:16:44 CEST 2017


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  eb5c286ceb43d368892304376bc03455cb16a74d (commit)
      from  be0bf14a139b1b0bbc983e77fc1e39071785b516 (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=eb5c286ceb43d368892304376bc03455cb16a74d

commit eb5c286ceb43d368892304376bc03455cb16a74d
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Sep 18 09:16:38 2017 +0000

    widget forge homepage detail activity: add link to globalactivity plugin if activated

diff --git a/src/common/widget/Widget_HomeDetailActivityMostActiveProjectWeek.class.php b/src/common/widget/Widget_HomeDetailActivityMostActiveProjectWeek.class.php
index b87f6f2..c500175 100644
--- a/src/common/widget/Widget_HomeDetailActivityMostActiveProjectWeek.class.php
+++ b/src/common/widget/Widget_HomeDetailActivityMostActiveProjectWeek.class.php
@@ -77,7 +77,7 @@ class Widget_HomeDetailActivityMostActiveProjectWeek extends Widget {
 					$theader[] = _('Activity');
 					$theader[] = _('By');
 
-					echo $HTML->listTableTop($theader);
+					$return .= $HTML->listTableTop($theader);
 					$displayTableTop = 1;
 				}
 				$displayinfo = $ffactivity->getDisplayInfo($activity);
@@ -87,7 +87,7 @@ class Widget_HomeDetailActivityMostActiveProjectWeek extends Widget {
 				if ($last_day != strftime($date_format, $activity['activity_date'])) {
 					$cells = array();
 					$cells[] = array(strftime($date_format, $activity['activity_date']), 'colspan' => 4);
-					echo $HTML->multiTableRow(array('class' => 'tableheading'), $cells, true);
+					$return .= $HTML->multiTableRow(array('class' => 'tableheading'), $cells, true);
 					$last_day=strftime($date_format, $activity['activity_date']);
 				}
 				$cells = array();
@@ -101,13 +101,17 @@ class Widget_HomeDetailActivityMostActiveProjectWeek extends Widget {
 				} else {
 					$cells[][] = $activity['realname'];
 				}
-				echo $HTML->multiTableRow(array(), $cells);
+				$return .= $HTML->multiTableRow(array(), $cells);
 			}
 			if ($displayTableTop) {
-				echo $HTML->listTableBottom();
+				$return .= $HTML->listTableBottom();
 			}
 		} else {
-			echo $HTML->warning_msg(_('No activity during the last week.'));
+			$return .= $HTML->warning_msg(_('No activity during the last week.'));
+		}
+		$pm = plugin_manager_get_object();
+		if ($pm->PluginIsInstalled('globalactivity')) {
+			$return .= util_make_link('/plugins/globalactivity/', _('Browse all activities.'));
 		}
 		return $return;
 	}

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

Summary of changes:
 ...idget_HomeDetailActivityMostActiveProjectWeek.class.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list