[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1344-gb72816f

Franck Villaume nerville at libremir.placard.fr.eu.org
Mon Jan 16 20:33:38 CET 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  b72816f2fc07263d4c13d4cdbfa8a0d39726440e (commit)
      from  998be2cf5c3f353e8f7e716ce5bf3b608f410ce6 (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=b72816f2fc07263d4c13d4cdbfa8a0d39726440e

commit b72816f2fc07263d4c13d4cdbfa8a0d39726440e
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Jan 16 20:33:21 2017 +0100

    fix js hide/show per customfield

diff --git a/src/common/tracker/views/form-addextrafield.php b/src/common/tracker/views/form-addextrafield.php
index c029fe1..8aebf3c 100644
--- a/src/common/tracker/views/form-addextrafield.php
+++ b/src/common/tracker/views/form-addextrafield.php
@@ -224,50 +224,65 @@ $jsvariable ="
 	var typeEffort = ".ARTIFACT_EXTRAFIELDTYPE_EFFORT.";";
 
 $javascript = <<<'EOS'
-	$("p[class^='for-']").hide()
+	$("p[class^='for-']").hide();
+	$("[name='parent']").hide();
 	$("input[value="+typeSelect+"]").on('change', function(){
 		$("p.for-select").show();
 		$("p[class^='for-']:not(.for-select)").hide();
+		$("[name='parent']").show();
 	});
 	$("input[value="+typeCheckBox+"]").on('change', function(){
 		$("p.for-check").show();
 		$("p[class^='for-']:not(.for-check)").hide();
+		$("[name='parent']").show();
 	});
 	$("input[value="+typeRadio+"]").on('change', function(){
 		$("p.for-radio").show();
 		$("p[class^='for-']:not(.for-radio)").hide();
+		$("[name='parent']").show();
 	});
 	$("input[value="+typeText+"]").on('change', function(){
 		$("label[for='attribute1']").text(size);
 		$("label[for='attribute2']").text(maxLength);
 		$("p.for-text").show();
 		$("p[class^='for-']:not(.for-text)").hide();
+		$("[name='parent']").hide();
 	});
 	$("input[value="+typeMultiSelect+"]").on('change', function(){
 		$("p.for-multiselect").show();
 		$("p[class^='for-']:not(.for-multiselect)").hide();
+		$("[name='parent']").show();
 	});
 	$("input[value="+typeTextArea+"]").on('change', function(){
 		$("label[for='attribute1']").text(rows);
 		$("label[for='attribute2']").text(columns);
 		$("p.for-textarea").show();
 		$("p[class^='for-']:not(.for-textarea)").hide();
+		$("[name='parent']").hide();
 	});
 	$("input[value="+typeRelation+"]").on('change', function(){
 		$("label[for='attribute1']").text(size);
 		$("label[for='attribute2']").text(maxLength);
 		$("p.for-relation").show();
 		$("p[class^='for-']:not(.for-relation)").hide();
+		$("[name='parent']").hide();
 	});
 	$("input[value="+typeInteger+"]").on('change', function(){
 		$("label[for='attribute1']").text(size);
 		$("label[for='attribute2']").text(maxLength);
 		$("p.for-integer").show();
 		$("p[class^='for-']:not(.for-integer)").hide();
+		$("[name='parent']").hide();
+	});
+	$("input[value="+typeDateTime+"]").on('change', function(){
+		$("p.for-release").show();
+		$("p[class^='for-']:not(.for-datetime)").hide();
+		$("[name='parent']").hide();
 	});
 	$("input[value="+typeUser+"]").on('change', function(){
 		$("p.for-user").show();
 		$("p[class^='for-']:not(.for-user)").hide();
+		$("[name='parent']").hide();
 	});
 	$("input[value="+typeRelease+"]").on('change', function(){
 		$("p.for-release").show();
@@ -313,7 +328,7 @@ echo html_e('label', array('for'=>'show100label'), _('Label for the none value')
 echo html_e('input', array('type'=>'text', 'name'=>'show100label', 'value'=>_('none'), 'size'=>'30')).html_e('br');
 echo html_ac(html_ap() - 1);
 
-echo html_ao('p', array('class'=>'for-select for-multiselect for-radio for-check'));
+echo html_e('p', array('class'=>'for-select for-multiselect for-radio for-check'), html_e('label', array('for'=>'parent'), _('Parent Field')));
 $pfarr = $ath->getExtraFields(array(ARTIFACT_EXTRAFIELDTYPE_RADIO, ARTIFACT_EXTRAFIELDTYPE_CHECKBOX,ARTIFACT_EXTRAFIELDTYPE_SELECT,ARTIFACT_EXTRAFIELDTYPE_MULTISELECT), false, true);
 $parentField = array();
 if (is_array($pfarr)) {
@@ -322,9 +337,7 @@ if (is_array($pfarr)) {
 	}
 }
 asort($parentField,SORT_FLAG_CASE | SORT_STRING);
-echo html_e('label', array('for'=>'parent'), _('Parent Field'));
 echo html_build_select_box_from_arrays(array_keys($parentField), array_values($parentField), 'parent', null, true, 'none').html_e('br');
-echo html_ac(html_ap() - 1);
 
 echo html_ao('p', array('class'=>'for-select for-multiselect for-radio for-check'));
 echo html_build_checkbox('autoassign', false, false);

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

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


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list