[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1897-g8cacb7a

Franck Villaume nerville at libremir.placard.fr.eu.org
Sat Jun 3 16:33:24 CEST 2017


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  8cacb7acc6eab4acb3308d844f8f9e44f2744b8d (commit)
       via  18cc7bb951415dc430becf7b4a3dd4493f6be3d7 (commit)
       via  72455900b611f8e08c39a3ac082465b50aa6d5fa (commit)
      from  075d22e3a257cbe5ce1e4b7f90c2627b6f8c4d5e (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=8cacb7acc6eab4acb3308d844f8f9e44f2744b8d

commit 8cacb7acc6eab4acb3308d844f8f9e44f2744b8d
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Jun 3 16:32:46 2017 +0200

    parent customfield has a specific tab

diff --git a/src/common/widget/Widget_TrackerContent.class.php b/src/common/widget/Widget_TrackerContent.class.php
index 98707de..5941f76 100644
--- a/src/common/widget/Widget_TrackerContent.class.php
+++ b/src/common/widget/Widget_TrackerContent.class.php
@@ -306,7 +306,7 @@ EOS;
 		$arr = $this->getExtraFieldIDs($owner_id);
 		$availableExtrafields = array();
 		foreach ($extrafields as $extrafield) {
-			if (!in_array($extrafield[0], $arr)) {
+			if (($extrafield[3] != ARTIFACT_EXTRAFIELDTYPE_PARENT) && !in_array($extrafield[0], $arr)) {
 				$availableExtrafields[] = $extrafield;
 			}
 		}

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=18cc7bb951415dc430becf7b4a3dd4493f6be3d7

commit 18cc7bb951415dc430becf7b4a3dd4493f6be3d7
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Jun 3 16:32:21 2017 +0200

    clean-up

diff --git a/src/common/tracker/ArtifactExtraField.class.php b/src/common/tracker/ArtifactExtraField.class.php
index e0d9fbe..6b6ad88 100644
--- a/src/common/tracker/ArtifactExtraField.class.php
+++ b/src/common/tracker/ArtifactExtraField.class.php
@@ -38,7 +38,6 @@ define('ARTIFACT_EXTRAFIELDTYPE_RELATION',9);
 define('ARTIFACT_EXTRAFIELDTYPE_INTEGER',10);
 /* reserved for aljeux extension, for merge into FusionForge */
 define('ARTIFACT_EXTRAFIELDTYPE_FORMULA',11);
-/* reserved for Evolvis extension, for merge into FusionForge */
 define('ARTIFACT_EXTRAFIELDTYPE_DATETIME',12);
 /* 13: reserved SLA */
 define('ARTIFACT_EXTRAFIELDTYPE_SLA',13);
diff --git a/src/common/tracker/ArtifactType.class.php b/src/common/tracker/ArtifactType.class.php
index 2639c50..3edd4b7 100644
--- a/src/common/tracker/ArtifactType.class.php
+++ b/src/common/tracker/ArtifactType.class.php
@@ -643,20 +643,19 @@ class ArtifactType extends FFError {
 			$extra_fields = array();
 			if (count($types)) {
 				$res = db_query_params('SELECT *
-				FROM artifact_extra_field_list
-				WHERE group_artifact_id=$1
-				AND field_type = ANY ($2)'.
-				$where.' '.
-				'ORDER BY field_type ASC',
-							array($this->getID(),
-									db_int_array_to_any_clause($types)));
+							FROM artifact_extra_field_list
+							WHERE group_artifact_id=$1
+							AND field_type = ANY ($2)'.
+							$where.' '.
+							'ORDER BY field_type ASC',
+							array($this->getID(), db_int_array_to_any_clause($types)));
 			} else {
 				$res = db_query_params('SELECT *
-				FROM artifact_extra_field_list
-				WHERE group_artifact_id=$1'.
-				$where.' '.
-				'ORDER BY field_type ASC',
-					array($this->getID()));
+							FROM artifact_extra_field_list
+							WHERE group_artifact_id=$1'.
+							$where.' '.
+							'ORDER BY field_type ASC',
+							array($this->getID()));
 			}
 			while ($arr = db_fetch_array($res)) {
 				$extra_fields[$arr['extra_field_id']] = $arr;

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=72455900b611f8e08c39a3ac082465b50aa6d5fa

commit 72455900b611f8e08c39a3ac082465b50aa6d5fa
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Jun 3 16:22:11 2017 +0200

    fix PHP warning, clean-up

diff --git a/src/common/tracker/include/ArtifactHtml.class.php b/src/common/tracker/include/ArtifactHtml.class.php
index 2b11aa1..98fd6e0 100644
--- a/src/common/tracker/include/ArtifactHtml.class.php
+++ b/src/common/tracker/include/ArtifactHtml.class.php
@@ -227,6 +227,7 @@ function hide_edit_button(id) {
 	function showChildren() {
 		global $HTML;
 		global $atid;
+		$readonly = false;
 		if (!forge_check_perm('tracker', $atid, 'submit')) {
 			$readonly = true;
 		}
@@ -272,6 +273,7 @@ function hide_edit_button(id) {
 	function showParent() {
 		global $HTML;
 		global $atid;
+		$readonly = false;
 		if (!forge_check_perm('tracker', $atid, 'submit')) {
 			$readonly = true;
 		}
@@ -313,6 +315,7 @@ function hide_edit_button(id) {
 	function showDependencies() {
 		global $HTML;
 		global $atid;
+		$readonly = false;
 		if (!forge_check_perm('tracker', $atid, 'submit')) {
 			$readonly = true;
 		}
diff --git a/src/common/widget/Widget_TrackerContent.class.php b/src/common/widget/Widget_TrackerContent.class.php
index ff72c1d..98707de 100644
--- a/src/common/widget/Widget_TrackerContent.class.php
+++ b/src/common/widget/Widget_TrackerContent.class.php
@@ -604,15 +604,17 @@ EOS;
 								/* reserved for aljeux extension, for merge into FusionForge */
 								case ARTIFACT_EXTRAFIELDTYPE_FORMULA:
 									break;
-								/* reserved for Evolvis extension, for merge into FusionForge */
 								case ARTIFACT_EXTRAFIELDTYPE_DATETIME:
 									if ($readonly) {
-										$cellContent .= date('Y-m-d H:i', $value);
+										if ($value) {
+											$cellContent .= date('Y-m-d H:i', $value);
+										} else {
+											$cellContent .= _('None');
+										}
 									} else {
 										$cellContent .= $ath->renderDatetime($keys[0], $value, $attrs);
 									}
 									break;
-								/* 12: reserved DATETIME*/
 								/* 13: reserved SLA */
 								case ARTIFACT_EXTRAFIELDTYPE_SLA:
 									break;
@@ -652,7 +654,7 @@ EOS;
 											$effortUnitFactory = New EffortUnitFactory($effortUnitSet);
 											$cellContent .= $effortUnitFactory->encodedToString($value);
 										} else {
-											$cellContent .= _('Undefined');
+											$cellContent .= _('None');
 										}
 									} else {
 										$cellContent .= $ath->renderEffort($keys[0], $value, $extrafieldObject->getAttribute1(), $extrafieldObject->getAttribute2(), $attrs);

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

Summary of changes:
 src/common/tracker/ArtifactExtraField.class.php   |  1 -
 src/common/tracker/ArtifactType.class.php         | 23 +++++++++++------------
 src/common/tracker/include/ArtifactHtml.class.php |  3 +++
 src/common/widget/Widget_TrackerContent.class.php | 12 +++++++-----
 4 files changed, 21 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list