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 c9dab36344b338c9837e45b65c9a52ab23cb7ce2 (commit)
from b00ba423e0d72b5e10d78484319e064e5bc14085 (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=c9dab36344b338c9837e45b65c9a52ab23cb7ce2
commit c9dab36344b338c9837e45b65c9a52ab23cb7ce2
Author: Franck Villaume <[email protected]>
Date: Wed Jan 18 20:02:41 2017 +0100
set the form id in the hidden value too
diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php
b/src/common/tracker/include/ArtifactTypeHtml.class.php
index 1dc916d..789e3b6 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -1185,7 +1185,11 @@ class ArtifactTypeHtml extends ArtifactType {
$attrs['class'] = 'effort';
}
$attrs['data-effortid'] = $extra_field_id;
- $return = html_e('input', array('type'=>'hidden',
'name'=>'extra_fields['.$extra_field_id.']', 'value'=>$value.'U'.$unitId));
+ $hiddenAttrs = array();
+ if (isset($attrs['form'])) {
+ $hiddenAttrs['form'] = $attrs['form'];
+ }
+ $return = html_e('input', array_merge(array('type'=>'hidden',
'name'=>'extra_fields['.$extra_field_id.']', 'value'=>$value.'U'.$unitId),
$hiddenAttrs));
$return .= html_e('input', array_merge(array('type'=>'number',
'name'=>'value['.$extra_field_id.']', 'value'=>$value, 'size'=>$size,
'maxlength'=>$maxlength, 'min'=>0), $attrs));
$return .= html_build_select_box_from_arrays($vals, $texts,
'unit['.$extra_field_id.']', $unitId, false, '', false, '', false, $attrs,
$opts_attrs);
return $return;
@@ -1309,7 +1313,6 @@ class ArtifactTypeHtml extends ArtifactType {
});
$("select.effort").on('change', function(){
var effortid = $(this).data("effortid");
- console.log(effortid);
$("input[name='value["+effortid+"]']").val(parseInt(parseInt($("input[name='extra_fields["+effortid+"]']").val())/$("select[name='unit["+effortid+"]']
option:selected").data('factor')));
$("input[name='extra_fields["+effortid+"]']").val($("input[name='value["+effortid+"]']").val()*$("select[name='unit["+effortid+"]']
option:selected").data('factor')+'U'+$("select[name='unit["+effortid+"]']").val());
});
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/include/ArtifactTypeHtml.class.php | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
