[Fusionforge-commits] FusionForge branch master updated. 6.0.4-1184-g70900e5

Franck Villaume nerville at libremir.placard.fr.eu.org
Sat Nov 26 16:13:02 CET 2016


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  70900e5b8114786daf2d336565c15fe594ee829d (commit)
      from  bff8babd7dff7d885566355a7da89774e3bb3490 (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=70900e5b8114786daf2d336565c15fe594ee829d

commit 70900e5b8114786daf2d336565c15fe594ee829d
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Nov 26 16:12:11 2016 +0100

    fix display datetime readonly value, fix frs test object

diff --git a/src/common/widget/Widget_TrackerContent.class.php b/src/common/widget/Widget_TrackerContent.class.php
index e0b2e79..e648b0a 100644
--- a/src/common/widget/Widget_TrackerContent.class.php
+++ b/src/common/widget/Widget_TrackerContent.class.php
@@ -368,7 +368,7 @@ class Widget_TrackerContent extends Widget {
 								/* reserved for Evolvis extension, for merge into FusionForge */
 								case ARTIFACT_EXTRAFIELDTYPE_DATETIME:
 									if ($readonly) {
-										$cells[] = array($cellContent.$value, 'style' => 'vertical-align: top;');
+										$cells[] = array($cellContent.date('Y-m-d H:i', $value), 'style' => 'vertical-align: top;');
 									} else {
 										$cells[] = array($cellContent.$ath->renderDatetime($extrafieldID, $value, $attrs), 'style' => 'vertical-align: top;');
 									}
@@ -395,9 +395,13 @@ class Widget_TrackerContent extends Widget {
 									if ($readonly) {
 										if ($value != 0) {
 											$releaseObj = frsrelease_get_object($value);
-											$value = $releaseObj->FRSPackage->getName().' - '.$releaseObj->getName();
+											if (is_object($releaseObj)) {
+												$value = $releaseObj->FRSPackage->getName().' - '.$releaseObj->getName();
+												$cells[] = array($cellContent.$value, 'style' => 'vertical-align: top;');
+											} else {
+												$cells[][] = ' ';
+											}
 										}
-										$cells[] = array($cellContent.$value, 'style' => 'vertical-align: top;');
 									} else {
 										$cells[] = array($cellContent.$ath->renderReleaseField($extrafieldID, $value, $extrafieldObject->getShow100(), $extrafieldObject->getShow100label(), false, false, false, $attrs), 'style' => 'vertical-align: top;');
 									}

-----------------------------------------------------------------------

Summary of changes:
 src/common/widget/Widget_TrackerContent.class.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list