[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1504-gad9a0db

[Franck Villaume]

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  ad9a0db57ed054d6433fd3154f42c91290800ffb (commit)
      from  f355a23d0234af6cc54655f4ed5b82babc668701 (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=ad9a0db57ed054d6433fd3154f42c91290800ffb

commit ad9a0db57ed054d6433fd3154f42c91290800ffb
Author: Stéphane-Eymeric Bredthauer <sebredthauer at gmail.com>
Date:   Mon Mar 6 09:23:44 2017 +0100

    Tracker: formula improvement Fix 1

diff --git a/src/common/tracker/views/form-editformula.php b/src/common/tracker/views/form-editformula.php
index 5a1c954..c92fe7b 100644
--- a/src/common/tracker/views/form-editformula.php
+++ b/src/common/tracker/views/form-editformula.php
@@ -49,7 +49,7 @@ if (!$ac || !is_object($ac)) {
 if (!$efe_id) {
 	$formula = $ac->getFormula();
 } else {
-	$ao = new ArtifactExtraFieldElement($ac,$id);
+	$ao = new ArtifactExtraFieldElement($ac,$efe_id);
 	if (!$ao || !is_object($ao)) {
 		exit_error(_('Unable to create ArtifactExtraFieldElement Object'),'tracker');
 	} elseif ($ao->isError()) {
@@ -239,7 +239,7 @@ echo html_e('input', array('type'=>'submit', 'name'=>'post_changes', 'value'=>_(
 if (!$efe_id) {
 	echo html_e('input', array('type'=>'button', 'onclick'=>'location.href="/tracker/admin/?update_box=1&group_id='.$group_id.'&id='.$ef_id.'&atid='.$ath->getID().'"; return false;','value'=>_('Cancel')));
 }else {
-	echo html_e('input', array('type'=>'button', 'onclick'=>'location.href="/tracker/admin/?update_opt=1&id='&efe_id.'&group_id='.$group_id.'&atid='.$ath->getID().'&boxid='.$ef_id.'"; return false;','value'=>_('Cancel')));
+	echo html_e('input', array('type'=>'button', 'onclick'=>'location.href="/tracker/admin/?update_opt=1&id='.$efe_id.'&group_id='.$group_id.'&atid='.$ath->getID().'&boxid='.$ef_id.'"; return false;','value'=>_('Cancel')));
 }
 echo html_ac(html_ap() - 1);
 

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

Summary of changes:
 src/common/tracker/views/form-editformula.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
FusionForge