From 6a55dbea35dcb89d28d45ea77791718cbe70f915 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 17 Sep 2015 09:40:46 +0100 Subject: [PATCH] Bug 14805: QA follow-up This patches remove a trailing whitespace and simplify 2 parts of code. Signed-off-by: Jonathan Druart --- .../intranet-tmpl/prog/en/modules/patroncards/manage.tt | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt index 1c9b7a1..ffddcac 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt @@ -19,16 +19,14 @@ function DeleteConfirm() { var element_ids = selected_layouts("delete"); - var answer; + var msg; if (element_ids.length > 1) { - var msg = _("Are you sure you want to delete %s batches?").format(element_ids.length); - answer = confirm(msg); + msg = _("Are you sure you want to delete %s batches?").format(element_ids.length); } else if (element_ids.length == 1) { - var msg = _("Are you sure you want to delete %s %s?").format("[% PROCESS translate_card_element element=card_element %]", element_ids[0]); - answer = confirm(msg); + msg = _("Are you sure you want to delete %s %s?").format("[% PROCESS translate_card_element element=card_element %]", element_ids[0]); } - if (answer) { + if (msg && confirm(msg)) { var elements = ""; for (var i = 0; i < element_ids.length; i++) { if (element_ids[i] > -1) { @@ -91,7 +89,7 @@ if (op == "delete") { var selectedDelete = new Array; for (i = 0; i < selected.length; i++) { - selectedDelete.push(document.layouts.action[selected[i]].value); + selectedDelete.push(document.layouts.action[selected[i]].value); } return(selectedDelete); } else { @@ -102,11 +100,10 @@ else if (selected.length < 1) { if (op == "edit") { alert(_("Please select one %s to %s.").format("[% PROCESS translate_card_element element=card_element %]", op)); - return (-1); } else { alert(_("Please select at least one %s to %s.").format("[% PROCESS translate_card_element element=card_element %]", op)); - return (-1); } + return (-1); } else { alert(_("Please select only one %s to %s.").format("[% PROCESS translate_card_element element=card_element %]", op)); -- 2.1.0