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 69293f2276624268cfb6d53bcb0d397354870662 (commit)
from 52c01532fed4af94c5a5ecb1d82932b9b8f6dbd4 (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=69293f2276624268cfb6d53bcb0d397354870662
commit 69293f2276624268cfb6d53bcb0d397354870662
Author: Franck Villaume <[email protected]>
Date: Sun Jan 22 11:51:05 2017 +0100
getFlattedArtifacts: display effort field correctly
diff --git a/src/www/soap/tracker/tracker.php b/src/www/soap/tracker/tracker.php
index 88c592d..60156f2 100644
--- a/src/www/soap/tracker/tracker.php
+++ b/src/www/soap/tracker/tracker.php
@@ -4,7 +4,7 @@
*
* Copyright 2004 (c) GForge, LLC
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
- * Copyright 2016, Franck Villaume - TrivialDev
+ * Copyright 2016-2017, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -955,6 +955,11 @@ function flattedartifacts_to_soap($at_arr) {
if(is_array($extrafieldsdatatext) &&
count($extrafieldsdatatext) > 0) {
foreach ($extrafieldsdatatext as
$extrafielddatatext) {
$fldarr = array();
+ if ($extrafielddatatext['type']
== ARTIFACT_EXTRAFIELDTYPE_EFFORT) {
+ $effortUnitSet = New
EffortUnitSet($at_arr[$i]->ArtifactType,
$at_arr[$i]->ArtifactType->getEffortUnitSet());
+ $effortUnitFactory =
New EffortUnitFactory($effortUnitSet);
+
$extrafielddatatext['value'] =
$effortUnitFactory->encodedToString($extrafielddatatext['value']);
+ }
$fldarr =
array('extra_field_name' => $extrafielddatatext['name'], 'field_value' =>
$extrafielddatatext['value']);
$flddata[]=$fldarr;
unset($fldarr);
-----------------------------------------------------------------------
Summary of changes:
src/www/soap/tracker/tracker.php | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
