From f064286c97d43fa2a1b70e5f4b5d9253aa46e0fc Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Thu, 21 Mar 2013 12:15:36 +0000 Subject: [PATCH 2/2] Bug 9044 [Follow-up] Add a blank option + add missing 'for' attributes --- .../prog/en/modules/catalogue/detail.tt | 37 ++++++++++++-------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 73c0c74..16cb247 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -53,18 +53,22 @@ function verify_images() { }); if (itemnumbers.length > 0) { var action = $('select[name="itemselection_action"]', div).val(); - var del = (action == 'delete') ? 1 : 0; - var url = '/cgi-bin/koha/tools/batchMod.pl?op=show'; - if (action == 'delete') { - url += '&del=1'; - } - url += '&itemnumber=' + itemnumbers.join('&itemnumber='); - url += '&src=' + '[% "/cgi-bin/koha/catalogue/detail.pl?biblionumber=$biblionumber" |uri %]'; - new_window = $("input[name='new_window']", div).attr('checked'); - if (new_window) { - window.open(url); + if (action.length > 0) { + var del = (action == 'delete') ? 1 : 0; + var url = '/cgi-bin/koha/tools/batchMod.pl?op=show'; + if (action == 'delete') { + url += '&del=1'; + } + url += '&itemnumber=' + itemnumbers.join('&itemnumber='); + url += '&src=' + '[% "/cgi-bin/koha/catalogue/detail.pl?biblionumber=$biblionumber" |uri %]'; + new_window = $("input[name='new_window']", div).attr('checked'); + if (new_window) { + window.open(url); + } else { + window.location.href = url; + } } else { - window.location.href = url; + alert(_("Please choose an action")); } } else { alert(_("Please select at least one item.")); @@ -386,13 +390,16 @@ function verify_images() { [% IF ( HTML5MediaEnabled ) %][% IF ( HTML5MediaSets ) %]
  • Play media
  • [% END %][% END %] +[% items_table_block_iter = 0 %] [% BLOCK items_table %] + [% items_table_block_iter = items_table_block_iter + 1 %] [% IF (StaffDetailItemSelection) %] Select all | Deselect all |
    - - + [% IF CAN_user_tools_items_batchdel %] [% END %] @@ -401,8 +408,8 @@ function verify_images() { [% END %] - - + +
    [% END %] -- 1.7.10.4