From a23aecd05f5c0e8c81561453da35f14788db52a1 Mon Sep 17 00:00:00 2001 From: Alex Arnaud Date: Mon, 11 Jun 2018 14:11:51 +0000 Subject: [PATCH] Bug 17656: Predication table - check all issues with same data-dow Signed-off-by: David Nind --- koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt | 1 + koha-tmpl/intranet-tmpl/prog/js/showpredictionpattern.js | 3 +-- koha-tmpl/intranet-tmpl/prog/js/subscription.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt index b202c1f969..d7a074e5cb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt @@ -127,6 +127,7 @@ }); }); + [% Asset.js("js/subscription-add.js") %] [% Asset.js("js/subscription.js") %] [% Asset.js("js/showpredictionpattern.js") %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/showpredictionpattern.js b/koha-tmpl/intranet-tmpl/prog/js/showpredictionpattern.js index 1efab8a3ff..6ab01c0b0a 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/showpredictionpattern.js +++ b/koha-tmpl/intranet-tmpl/prog/js/showpredictionpattern.js @@ -2,14 +2,13 @@ function Check_boxes(dow) { if($(":checkbox[data-dow='"+dow+"']:first").is(':checked')) { $("#predictionst :checkbox[data-dow='"+dow+"']").each(function(){ $(this).prop('checked', true); - return false; }); } else { $("#predictionst :checkbox[data-dow='"+dow+"']").each(function(){ $(this).prop('checked', false); - return false; }); } + return false; } function Check_permanent_irregularities() { nothing_checked = 1; diff --git a/koha-tmpl/intranet-tmpl/prog/js/subscription.js b/koha-tmpl/intranet-tmpl/prog/js/subscription.js index 6e16f8b02b..e07e084895 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/subscription.js +++ b/koha-tmpl/intranet-tmpl/prog/js/subscription.js @@ -57,7 +57,7 @@ function testPredictionPattern() { for(i in ajaxParams) { var param = ajaxParams[i]; var value = $("#"+param).val(); - if(value.length > 0) + if(value && value.length > 0) ajaxData[param] = value; } -- 2.11.0