From 12a8de065fdbdff48346597a124932e2709d95c4 Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Mon, 12 Jan 2015 18:49:34 +0100 Subject: [PATCH] PHRAS-147 Fix javascript issue for suggested values --- .../collection/suggested_value.html.twig | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/templates/web/admin/collection/suggested_value.html.twig b/templates/web/admin/collection/suggested_value.html.twig index d3d3d4c7cc..f0d241bc9a 100644 --- a/templates/web/admin/collection/suggested_value.html.twig +++ b/templates/web/admin/collection/suggested_value.html.twig @@ -427,23 +427,24 @@ function desactiv4VS() if( o2.length > 0 ) { - var optionLength = o2.find("options").length; - if ( optionLength > 1) { + var optionLength = o2.find("option").length; + var index = o2.prop("selectedIndex"); - if ((o2.prop("selectedIndex")+1) != optionLength) { + if ( optionLength > 1) { + if ((index+1) == optionLength) { activer_bout('bout_desc',false); } else { activer_bout('bout_desc',true); } - if (o2.prop("selectedIndex")!=0 && optionLength>1) { + if (index == 0 && optionLength>1) { activer_bout('bout_mont',false); } else { activer_bout('bout_mont',true); } } else { - activer_bout('bout_desc',true); - activer_bout('bout_mont',true); + activer_bout('bout_desc',false); + activer_bout('bout_mont',false); } } @@ -461,7 +462,7 @@ function activ4VS() } desactiv4VS(); - activer_bout('bout_supp',false); + activer_bout('bout_supp',true); } // supprime une valsug @@ -516,7 +517,7 @@ function supprimer() } if(o2.prop("selectedIndex")<0) { - activer_bout('bout_supp',true); + activer_bout('bout_supp',false); } desactiv4VS(); @@ -766,7 +767,11 @@ function activer_bout(idBout,val) o = $("#"+idBout); if( o.length > 0 ) { - o.attr("disabled", val); + if (!val) { + o.attr("disabled", true); + } else { + o.removeAttr("disabled"); + } } }