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 77d393c053cf31478abb5afb46f9191f82997118 (commit)
from 956534c725726bcf7832f73d7614f5422f7de215 (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=77d393c053cf31478abb5afb46f9191f82997118
commit 77d393c053cf31478abb5afb46f9191f82997118
Author: Franck Villaume <[email protected]>
Date: Wed Sep 20 12:06:17 2017 +0000
fix wrong var
diff --git a/src/common/widget/Widget_TrackerContent.class.php
b/src/common/widget/Widget_TrackerContent.class.php
index ba71d17..59f9103 100644
--- a/src/common/widget/Widget_TrackerContent.class.php
+++ b/src/common/widget/Widget_TrackerContent.class.php
@@ -429,7 +429,7 @@ EOS;
$parent = $extrafieldObject->getParent();
if (!is_null($parent) && !empty($parent) && $parent != '100') {
$selectedElmnts = (isset($selected[$parent]) ? $selected[$parent] : '');
-
$allowed = $aef->getAllowedValues($selectedElmnts);
+
$allowed = $extrafieldObject->getAllowedValues($selectedElmnts);
}
$cellContent .= $ath->renderSelect($keys[0], $value,
$extrafieldObject->getShow100(), $extrafieldObject->getShow100label(), false,
false, $allowed, $attrs);
}
@@ -446,7 +446,7 @@ EOS;
$parent = $extrafieldObject->getParent();
if (!is_null($parent) && !empty($parent) && $parent != '100') {
$selectedElmnts = (isset($selected[$parent]) ? $selected[$parent] : '');
-
$allowed = $aef->getAllowedValues($selectedElmnts);
+
$allowed = $extrafieldObject->getAllowedValues($selectedElmnts);
}
$cellContent .= $ath->renderCheckbox($keys[0], $value,
$extrafieldObject->getShow100(), $extrafieldObject->getShow100label(),
$allowed, $attrs);
}
@@ -463,7 +463,7 @@ EOS;
$parent = $extrafieldObject->getParent();
if (!is_null($parent) && !empty($parent) && $parent != '100') {
$selectedElmnts = (isset($selected[$parent]) ? $selected[$parent] : '');
-
$allowed = $aef->getAllowedValues($selectedElmnts);
+
$allowed = $extrafieldObject->getAllowedValues($selectedElmnts);
}
$cellContent .= $ath->renderRadio($keys[0], $value,
$extrafieldObject->getShow100(), $extrafieldObject->getShow100label(), false,
false, $allowed, $attrs);
}
@@ -496,7 +496,7 @@ EOS;
$parent = $extrafieldObject->getParent();
if (!is_null($parent) && !empty($parent) && $parent != '100') {
$selectedElmnts = (isset($selected[$parent]) ? $selected[$parent] : '');
-
$allowed = $aef->getAllowedValues($selectedElmnts);
+
$allowed = $extrafieldObject->getAllowedValues($selectedElmnts);
}
$cellContent .= $ath->renderMultiSelectBox($keys[0], $value,
$extrafieldObject->getShow100(), $extrafieldObject->getShow100label(),
$allowed, $attrs);
}
@@ -537,7 +537,7 @@ EOS;
}
if ($childOpen) {
$extrafieldObject = new ArtifactExtraField($ath, $keys[0]);
-
//$aef = new ArtifactExtraField($this,
$efarr[$i]['extra_field_id']);
+
//$extrafieldObject = new ArtifactExtraField($this,
$efarr[$i]['extra_field_id']);
$statusArr = $extrafieldObject->getAvailableValues();
$openStatus = array();
foreach ($statusArr as $status) {
diff --git a/src/www/include/html.php b/src/www/include/html.php
index bc4922c..b4f4aa3 100644
--- a/src/www/include/html.php
+++ b/src/www/include/html.php
@@ -1000,7 +1000,7 @@ function html_build_checkboxes_from_arrays($vals, $texts,
$check_name, $checked=
});
//]]';
$return .= html_e('script', array( 'type'=>'text/javascript'),
$javascript);
- $return .= html_p('p', array(), html_e('input', array_merge(
array( 'type' => 'checkbox', 'name' => 'checkall_'.$check_name, 'id' =>
'checkall_'.$check_name ), $attrs_checkall)).
+ $return .= html_e('p', array(), html_e('input', array_merge(
array( 'type' => 'checkbox', 'name' => 'checkall_'.$check_name, 'id' =>
'checkall_'.$check_name ), $attrs_checkall)).
html_e('label', array_merge(
array( 'for' => 'checkall_'.$check_name), $title), _('Check all'), false));
}
-----------------------------------------------------------------------
Summary of changes:
src/common/widget/Widget_TrackerContent.class.php | 10 +++++-----
src/www/include/html.php | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
