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 fb795824a28a5f9b20fddeaf08d0fee6d2ae7199 (commit)
via e41d47389c9bef7d56b76b48aaf9de363449a3b2 (commit)
from c9dab36344b338c9837e45b65c9a52ab23cb7ce2 (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=fb795824a28a5f9b20fddeaf08d0fee6d2ae7199
commit fb795824a28a5f9b20fddeaf08d0fee6d2ae7199
Author: Franck Villaume <[email protected]>
Date: Wed Jan 18 20:30:20 2017 +0100
avoid double ; & do not use magic number
diff --git a/src/common/tracker/actions/browse.php
b/src/common/tracker/actions/browse.php
index d339c1d..5f44414 100644
--- a/src/common/tracker/actions/browse.php
+++ b/src/common/tracker/actions/browse.php
@@ -696,9 +696,9 @@ if ($art_arr && $art_cnt > 0) {
if (intval($f) > 0) {
// Now display extra-fields
(fields are numbers).
$value =
$extra_data[$f]['value'];
- if ($extra_data[$f]['type'] ==
9) {
+ if ($extra_data[$f]['type'] ==
ARTIFACT_EXTRAFIELDTYPE_RELATION) {
$value =
preg_replace('/\b(\d+)\b/e', "_artifactid2url('\\1')", $value);
- } elseif
($extra_data[$f]['type'] == 7) {
+ } elseif
($extra_data[$f]['type'] == ARTIFACT_EXTRAFIELDTYPE_STATUS) {
if
($art_arr[$i]->getStatusID() == 2) {
$value = '<span
class="strike">'.$value.'</span>';
}
diff --git a/src/common/widget/Widget_TrackerContent.class.php
b/src/common/widget/Widget_TrackerContent.class.php
index 137ca07..9fd5056 100644
--- a/src/common/widget/Widget_TrackerContent.class.php
+++ b/src/common/widget/Widget_TrackerContent.class.php
@@ -592,7 +592,7 @@ EOS;
if ($value) {
$effortUnitSet = New EffortUnitSet($ath, $ath->getEffortUnitSet());
$effortUnitFactory = New EffortUnitFactory($effortUnitSet);
-
$cellContent .= $effortUnitFactory->encodedToString($value);;
+
$cellContent .= $effortUnitFactory->encodedToString($value);
} else {
$cellContent .= _('Undefined');
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e41d47389c9bef7d56b76b48aaf9de363449a3b2
commit e41d47389c9bef7d56b76b48aaf9de363449a3b2
Author: Franck Villaume <[email protected]>
Date: Wed Jan 18 20:21:08 2017 +0100
fix PHP warning
diff --git a/src/common/tracker/actions/browse.php
b/src/common/tracker/actions/browse.php
index 300ffc3..d339c1d 100644
--- a/src/common/tracker/actions/browse.php
+++ b/src/common/tracker/actions/browse.php
@@ -7,7 +7,7 @@
* Copyright (C) 2011-2012 Alain Peyrat - Alcatel-Lucent
* Copyright 2011, Iñigo Martinez
* Copyright 2012, Thorsten “mirabilos” Glaser <[email protected]>
- * Copyright 2012-2016, Franck Villaume - TrivialDev
+ * Copyright 2012-2017, Franck Villaume - TrivialDev
* Copyright 2014, Stéphane-Eymeric Bredthauer
* Copyright 2016, Stéphane-Eymeric Bredthauer - TrivialDev
* http://fusionforge.org
@@ -401,7 +401,7 @@ foreach ($sort_fields as $sort_field) {
break;
//no ordering on these columns yet.
default:
- if (intval($sort_field) > 0) {
+ if (intval($sort_field) > 0 &&
isset($efarr[$sort_field])) {
if ($efarr[$sort_field]['field_type'] ==
ARTIFACT_EXTRAFIELDTYPE_STATUS) {
echo
'<td>'.$ath->getExtraFieldName($sort_field)._(':').'<br>'.$status_box.'</td>';
}
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/actions/browse.php | 8 ++++----
src/common/widget/Widget_TrackerContent.class.php | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
