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 06a6d3b8bde3cbc61e0b26d702f49bf59470b53f (commit)
via b7842728e6c62bf86194a7b3c9912810655f83f8 (commit)
via 276b379d7ca679fba6aedcfffd5369dbaedf87d5 (commit)
via a81ce516290643df58aa015b19cc77eb1e303521 (commit)
from 174f8b6e0e4f2df4b9f5dd4808de92e90d62c226 (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=06a6d3b8bde3cbc61e0b26d702f49bf59470b53f
commit 06a6d3b8bde3cbc61e0b26d702f49bf59470b53f
Author: Franck Villaume <[email protected]>
Date: Fri Jan 5 16:08:09 2018 +0000
fix double header in case of error
diff --git a/src/www/activity/index.php b/src/www/activity/index.php
index 77b2377..0cab07c 100644
--- a/src/www/activity/index.php
+++ b/src/www/activity/index.php
@@ -92,7 +92,7 @@ $group = group_get_object($group_id);
if (!$group || !is_object($group)) {
exit_no_group();
} elseif ($group->isError()) {
- exit_error($group->getErrorMessage(), 'home');
+ exit_error($group->getErrorMessage(), 'activity');
} elseif (!forge_get_config('use_activity')) {
exit_disabled();
} elseif (!$group->usesActivity()) {
@@ -101,8 +101,6 @@ if (!$group || !is_object($group)) {
html_use_jqueryui();
-site_project_header(array('title'=>_('Activity'), 'group'=>$group_id,
'toptab'=>'activity'));
-
$ids = array();
$texts = array();
@@ -155,7 +153,7 @@ if (count($show) < 1) {
$ffactivity = new Activity();
$results = $ffactivity->getActivitiesForProject($group_id, $begin, $end,
$section);
if ($results === false) {
- exit_error(_('Unable to get
activities')._(':').$ffactivity->getErrorMessage(), 'home');
+ exit_error(_('Unable to get
activities')._(':').$ffactivity->getErrorMessage(), 'activity');
}
// If plugins wants to add activities.
$hookParams['group_id'] = $group_id;
@@ -173,10 +171,12 @@ if (count($show) < 1) {
foreach ($show as $showthis) {
if (array_search($showthis, $ids) === false) {
- exit_error(_('Invalid Data Passed to query'), 'home');
+ exit_error(_('Invalid Data Passed to query'), 'activity');
}
}
+site_project_header(array('title'=>_('Activity'), 'group'=>$group_id,
'toptab'=>'activity'));
+
if (count($ids) < 1) {
echo $HTML->information(_('No Activity Found'));
} else {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=b7842728e6c62bf86194a7b3c9912810655f83f8
commit b7842728e6c62bf86194a7b3c9912810655f83f8
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.'));
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=276b379d7ca679fba6aedcfffd5369dbaedf87d5
commit 276b379d7ca679fba6aedcfffd5369dbaedf87d5
Author: Franck Villaume <[email protected]>
Date: Fri Jan 5 09:53:30 2018 +0000
docman review: use floor for %
diff --git a/src/common/docman/DocumentReview.class.php
b/src/common/docman/DocumentReview.class.php
index 1117ccb..214b89c 100644
--- a/src/common/docman/DocumentReview.class.php
+++ b/src/common/docman/DocumentReview.class.php
@@ -558,7 +558,7 @@ class DocumentReview extends FFError {
$doneMandatoryUsers[] = $mandatoryUser;
}
}
- $percentDoneMandatoryUsers = ((count($doneMandatoryUsers) /
count($mandatoryUsers)) * 100).'%';
+ $percentDoneMandatoryUsers = floor((count($doneMandatoryUsers)
/ count($mandatoryUsers)) * 100).'%';
$doneOptionalUsers = array();
$optionalUsers = $this->getOptionalUsers();
foreach ($optionalUsers as $optionalUser) {
@@ -567,7 +567,7 @@ class DocumentReview extends FFError {
}
}
if (count($optionalUsers) > 0) {
- $percentDoneOptionalUsers = ((count($doneOptionalUsers)
/ count($optionalUsers)) * 100).'%';
+ $percentDoneOptionalUsers =
floor((count($doneOptionalUsers) / count($optionalUsers)) * 100).'%';
} else {
$percentDoneOptionalUsers = _('n/a');
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=a81ce516290643df58aa015b19cc77eb1e303521
commit a81ce516290643df58aa015b19cc77eb1e303521
Author: Franck Villaume <[email protected]>
Date: Thu Jan 4 14:14:09 2018 +0000
tracker search renderer: use permalink for artifact. use theme function for
icon
diff --git
a/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
index 4d5158e..2f79d42 100644
--- a/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
@@ -56,6 +56,7 @@ class TrackersHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
* @return string html output
*/
function getRows() {
+ global $HTML;
$result =
$this->searchQuery->getData($this->searchQuery->getRowsPerPage(),$this->searchQuery->getOffset());
$return = '';
@@ -73,8 +74,7 @@ class TrackersHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
$return .= '<tr>'
.'<td style="width: 5%"></td>'
.'<td>'.$row['artifact_id'].'</td>'
-
.'<td>'.util_make_link('/tracker/?func=detail&group_id='.$this->groupId.'&aid='.$row['artifact_id'].'&atid='.$row['group_artifact_id'],
-
html_image('ic/tracker20g.png').' '.$row['summary'])
+
.'<td>'.util_make_link('/tracker/a_follow.php/'.$row['artifact_id'],
$HTML->getFollowPic().' '.$row['summary'])
.'</td>'
.'<td style="width:
15%">'.$row['realname'].'</td>'
.'<td style="width:
15%">'.relative_date($row['open_date']).'</td></tr>';
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/DocumentReview.class.php | 4 ++--
.../Widget_HomeDetailActivityMostActiveProjectWeek.class.php | 5 +++++
src/www/activity/index.php | 10 +++++-----
.../include/renderers/TrackersHtmlSearchRenderer.class.php | 4 ++--
4 files changed, 14 insertions(+), 9 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
