[Fusionforge-commits] FusionForge branch master updated. 6.0.4-1111-g42dcd84

Franck Villaume nerville at libremir.placard.fr.eu.org
Wed Oct 26 19:23:47 CEST 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  42dcd84c2c01cfc5e63bf6f4301678161c7cb0da (commit)
       via  9b540b2c0691235782100749df29d2b4e0a099cc (commit)
      from  5b94223177736a624e80b982479757f4309b2076 (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=42dcd84c2c01cfc5e63bf6f4301678161c7cb0da

commit 42dcd84c2c01cfc5e63bf6f4301678161c7cb0da
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Oct 26 19:23:30 2016 +0200

    fix update default value on extrafield edit

diff --git a/src/common/tracker/actions/admin-updates.php b/src/common/tracker/actions/admin-updates.php
index db5c1bf..0e764ca 100644
--- a/src/common/tracker/actions/admin-updates.php
+++ b/src/common/tracker/actions/admin-updates.php
@@ -245,7 +245,7 @@ if (getStringFromRequest('add_extrafield')) {
 	$autoassign = getStringFromRequest('autoassign');
 	$is_hidden_on_submit = getStringFromRequest('is_hidden_on_submit');
 	$is_disabled = getStringFromRequest('is_disabled');
-	$default = getStringFromRequest('default');
+	$default = getStringFromRequest('default', false);
 	$ac = new ArtifactExtraField($ath, $id);
 	if (!$ac || !is_object($ac)) {
 		$error_msg .= _('Unable to create ArtifactExtraField Object');
@@ -261,7 +261,7 @@ if (getStringFromRequest('add_extrafield')) {
 			$error_msg .= _('Update failed')._(': ').$ac->getErrorMessage();
 			$ac->clearError();
 		} else {
-			if(!$ac->setDefaultValues($default)){
+			if($default && !$ac->setDefaultValues($default)){
 				$error_msg .= _('Update failed')._(': ').$ac->getErrorMessage();
 				$ac->clearError();
 			} else {

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

commit 9b540b2c0691235782100749df29d2b4e0a099cc
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Oct 26 18:59:56 2016 +0200

    remove wrong return

diff --git a/src/common/include/utils_crossref.php b/src/common/include/utils_crossref.php
index 5f314b0..c5a2251 100644
--- a/src/common/include/utils_crossref.php
+++ b/src/common/include/utils_crossref.php
@@ -45,7 +45,6 @@ function util_gen_cross_ref($text, $group_id) {
 
 	// Handle FusionForge [Dnnn] Syntax => links to document.
 	$text = preg_replace_callback('/\[D(\d+)\]/', create_function('$matches', 'return _documentid2url($matches[1],'.$group_id.');'), $text);
-	return $text;
 
 	// Handle FusionForge [Rnnn] Syntax => links to frs release.
 	$text = preg_replace_callback('/\[R(\d+)\]/', create_function('$matches', 'return _frsreleaseid2url($matches[1]);'), $text);

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

Summary of changes:
 src/common/include/utils_crossref.php        | 1 -
 src/common/tracker/actions/admin-updates.php | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list