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 7f4ed5d446279ecedd54f2490b33a5ff25f35c41 (commit)
from bbc90d7edb210e87493a7dc663f1223f88ae512a (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=7f4ed5d446279ecedd54f2490b33a5ff25f35c41
commit 7f4ed5d446279ecedd54f2490b33a5ff25f35c41
Author: Franck Villaume <[email protected]>
Date: Fri Jan 5 15:19:42 2018 +0000
better information message when no activity visible to user
diff --git
a/src/common/widget/Widget_HomeDetailActivityMostActiveProjectWeek.class.php
b/src/common/widget/Widget_HomeDetailActivityMostActiveProjectWeek.class.php
index c500175..0c37407 100644
--- a/src/common/widget/Widget_HomeDetailActivityMostActiveProjectWeek.class.php
+++ b/src/common/widget/Widget_HomeDetailActivityMostActiveProjectWeek.class.php
@@ -65,6 +65,7 @@ class Widget_HomeDetailActivityMostActiveProjectWeek extends
Widget {
usort($activities, 'Activity::date_compare');
$displayTableTop = 0;
$last_day = 0;
+ $displayed_activities = false;
foreach ($activities as $activity) {
$docmanerror = 0;
if
(!$ffactivity->check_perm_for_activity($activity, $this->cached_perms)) {
@@ -84,6 +85,7 @@ class Widget_HomeDetailActivityMostActiveProjectWeek extends
Widget {
if (!$displayinfo) {
continue;
}
+ $displayed_activities = true;
if ($last_day != strftime($date_format,
$activity['activity_date'])) {
$cells = array();
$cells[] = array(strftime($date_format,
$activity['activity_date']), 'colspan' => 4);
@@ -106,6 +108,9 @@ class Widget_HomeDetailActivityMostActiveProjectWeek
extends Widget {
if ($displayTableTop) {
$return .= $HTML->listTableBottom();
}
+ if (!$displayed_activities) {
+ $return .= $HTML->warning_msg(_('No activity
during the last week.'));
+ }
} else {
$return .= $HTML->warning_msg(_('No activity during the
last week.'));
}
-----------------------------------------------------------------------
Summary of changes:
.../widget/Widget_HomeDetailActivityMostActiveProjectWeek.class.php | 5 +++++
1 file changed, 5 insertions(+)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
