From 46dcdfcf3d04fa4d39bb261924ddfe646b99a12e Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Wed, 21 Nov 2012 17:38:28 +0100 Subject: [PATCH] Bug 9126: Do not return from Check too early. If there is no errors, it should continue instead of returning true. + move a block of code at the end of Check function. This avoid detaching and re-attaching a HTML block if there are errors. --- .../prog/en/modules/acqui/orderreceive.tt | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index c6559c3..42b4c0d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -18,17 +18,19 @@ } }); - var alertString; - if (total_errors==0) { - return true; - } else { - alertString = _("Form not submitted because of the following problem(s)"); + if (total_errors != 0) { + var alertString = _("Form not submitted because of the following problem(s)"); alertString += "\n------------------------------------------------------------------------------------\n"; alertString += "\n- "+ total_errors+_(" mandatory fields empty (highlighted)"); alert(alertString); return false; } + if(check_additem('[% UniqueItemFields %]') == false){ + alert(_('Duplicate values detected. Please correct the errors and resubmit.') ); + return false; + }; + // Remove last itemblock if it is not in items_list var lastitemblock = $("#outeritemblock > div:last"); var tobedeleted = true; @@ -41,14 +43,6 @@ if(tobedeleted){ $(lastitemblock).remove(); } - - if(check_additem('[% UniqueItemFields %]') == false){ - alert(_('Duplicate values detected. Please correct the errors and resubmit.') ); - if(tobedeleted) { - $(lastitemblock).appendTo("#outeritemblock"); - } - return false; - }; [% END %] return true; -- 1.7.2.5