From 5a56e802d9bcdc39409394539a98153b16d18033 Mon Sep 17 00:00:00 2001 From: florian HENRY Date: Fri, 9 Mar 2018 19:10:52 +0100 Subject: [PATCH 1/3] FIX #8232 --- htdocs/core/class/commonobject.class.php | 4 +++- htdocs/core/tpl/extrafields_view.tpl.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 54eeffdc4b6..a632a29b0f3 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -5835,9 +5835,11 @@ abstract class CommonObject jQuery(document).ready(function() { function showOptions(child_list, parent_list) { - var val = $("select[name=\"options_"+parent_list+"\"]").val(); + var val = $("select[name="+parent_list+"]").val(); + var parentVal = parent_list + ":" + val; if(val > 0) { + $("select[name=\""+child_list+"\"] option[parent]").hide(); $("select[name=\""+child_list+"\"] option[parent=\""+parentVal+"\"]").show(); } else { diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php index 3559df44c9c..e7abadac599 100644 --- a/htdocs/core/tpl/extrafields_view.tpl.php +++ b/htdocs/core/tpl/extrafields_view.tpl.php @@ -151,7 +151,7 @@ if (empty($reshook) && ! empty($extrafields->attributes[$object->table_element][ jQuery(document).ready(function() { function showOptions(child_list, parent_list) { - var val = $("select[name=\"options_"+parent_list+"\"]").val(); + var val = $("select[name="+parent_list+"]").val(); var parentVal = parent_list + ":" + val; if(val > 0) { $("select[name=\""+child_list+"\"] option[parent]").hide(); From 02beed265eac5f9e6acd27c7fccafe6e96301973 Mon Sep 17 00:00:00 2001 From: florian HENRY Date: Fri, 9 Mar 2018 19:14:43 +0100 Subject: [PATCH 2/3] better space --- htdocs/core/class/commonobject.class.php | 3 +-- htdocs/core/tpl/extrafields_view.tpl.php | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index a632a29b0f3..d9e08070f8b 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -5836,10 +5836,9 @@ abstract class CommonObject function showOptions(child_list, parent_list) { var val = $("select[name="+parent_list+"]").val(); - var parentVal = parent_list + ":" + val; - if(val > 0) { + if(val > 0) { $("select[name=\""+child_list+"\"] option[parent]").hide(); $("select[name=\""+child_list+"\"] option[parent=\""+parentVal+"\"]").show(); } else { diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php index e7abadac599..dffd0e739f6 100644 --- a/htdocs/core/tpl/extrafields_view.tpl.php +++ b/htdocs/core/tpl/extrafields_view.tpl.php @@ -153,6 +153,7 @@ if (empty($reshook) && ! empty($extrafields->attributes[$object->table_element][ { var val = $("select[name="+parent_list+"]").val(); var parentVal = parent_list + ":" + val; + if(val > 0) { $("select[name=\""+child_list+"\"] option[parent]").hide(); $("select[name=\""+child_list+"\"] option[parent=\""+parentVal+"\"]").show(); From 42fed5981d2f5617188d55ce0c6be73263255856 Mon Sep 17 00:00:00 2001 From: florian HENRY Date: Fri, 9 Mar 2018 19:16:06 +0100 Subject: [PATCH 3/3] bettre syntax --- htdocs/core/class/commonobject.class.php | 1 - htdocs/core/tpl/extrafields_view.tpl.php | 1 - 2 files changed, 2 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index d9e08070f8b..d55e564d774 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -5837,7 +5837,6 @@ abstract class CommonObject { var val = $("select[name="+parent_list+"]").val(); var parentVal = parent_list + ":" + val; - if(val > 0) { $("select[name=\""+child_list+"\"] option[parent]").hide(); $("select[name=\""+child_list+"\"] option[parent=\""+parentVal+"\"]").show(); diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php index dffd0e739f6..e7abadac599 100644 --- a/htdocs/core/tpl/extrafields_view.tpl.php +++ b/htdocs/core/tpl/extrafields_view.tpl.php @@ -153,7 +153,6 @@ if (empty($reshook) && ! empty($extrafields->attributes[$object->table_element][ { var val = $("select[name="+parent_list+"]").val(); var parentVal = parent_list + ":" + val; - if(val > 0) { $("select[name=\""+child_list+"\"] option[parent]").hide(); $("select[name=\""+child_list+"\"] option[parent=\""+parentVal+"\"]").show();