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 6215f2e15ce1a179c474259c7010161ddbdb60c9 (commit)
from fb795824a28a5f9b20fddeaf08d0fee6d2ae7199 (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=6215f2e15ce1a179c474259c7010161ddbdb60c9
commit 6215f2e15ce1a179c474259c7010161ddbdb60c9
Author: Stéphane-Eymeric Bredthauer <[email protected]>
Date: Wed Jan 18 22:58:42 2017 +0100
Tracker: Fix artifcat browser for effort
diff --git a/src/common/tracker/Artifact.class.php
b/src/common/tracker/Artifact.class.php
index c2c458d..e5cfd55 100644
--- a/src/common/tracker/Artifact.class.php
+++ b/src/common/tracker/Artifact.class.php
@@ -8,7 +8,7 @@
* Copyright (C) 2009-2013 Alain Peyrat, Alcatel-Lucent
* Copyright 2012, Thorsten “mirabilos” Glaser <[email protected]>
* Copyright 2014-2016, Franck Villaume - TrivialDev
- * Copyright 2016, Stéphane-Eymeric Bredthauer - TrivialDev
+ * Copyright 2016-2017, Stéphane-Eymeric Bredthauer - TrivialDev
*
* This file is part of FusionForge. FusionForge is free software;
* you can redistribute it and/or modify it under the terms of the
@@ -1921,6 +1921,7 @@ class Artifact extends FFObject {
case ARTIFACT_EXTRAFIELDTYPE_TEXTAREA:
case ARTIFACT_EXTRAFIELDTYPE_RELATION:
case ARTIFACT_EXTRAFIELDTYPE_INTEGER:
+ case ARTIFACT_EXTRAFIELDTYPE_EFFORT:
if (isset($efd[$efid])) {
$value = $efd[$efid];
} else {
diff --git a/src/common/tracker/actions/browse.php
b/src/common/tracker/actions/browse.php
index 5f44414..844b591 100644
--- a/src/common/tracker/actions/browse.php
+++ b/src/common/tracker/actions/browse.php
@@ -9,7 +9,7 @@
* Copyright 2012, Thorsten “mirabilos” Glaser <[email protected]>
* Copyright 2012-2017, Franck Villaume - TrivialDev
* Copyright 2014, Stéphane-Eymeric Bredthauer
- * Copyright 2016, Stéphane-Eymeric Bredthauer - TrivialDev
+ * Copyright 2016-2017, Stéphane-Eymeric Bredthauer - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -702,6 +702,12 @@ if ($art_arr && $art_cnt > 0) {
if
($art_arr[$i]->getStatusID() == 2) {
$value = '<span
class="strike">'.$value.'</span>';
}
+ } elseif
($extra_data[$f]['type'] == ARTIFACT_EXTRAFIELDTYPE_EFFORT) {
+ if
(!isset($effortUnitSet)) {
+ $effortUnitSet
= new EffortUnitSet($ath, $ath->getEffortUnitSet());
+
$effortUnitFactory = new EffortUnitFactory($effortUnitSet);
+ }
+ $value =
$effortUnitFactory->encodedToString($value);
}
echo '<td>' . $value .'</td>';
} else {
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/Artifact.class.php | 3 ++-
src/common/tracker/actions/browse.php | 8 +++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
