From 08b6f206205d0b6116f980bb5a9fda5c726bdd69 Mon Sep 17 00:00:00 2001 From: Jason Etheridge Date: Tue, 12 Apr 2011 13:05:00 -0400 Subject: [PATCH] let Change Peer Type have its own menulist for clarity --- .../server/cat/manage_multi_home_items.js | 22 ++++++++-------------- .../server/locale/en-US/cat.properties | 5 +---- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/cat/manage_multi_home_items.js b/Open-ILS/xul/staff_client/server/cat/manage_multi_home_items.js index ef999db532..518b665892 100644 --- a/Open-ILS/xul/staff_client/server/cat/manage_multi_home_items.js +++ b/Open-ILS/xul/staff_client/server/cat/manage_multi_home_items.js @@ -6,7 +6,7 @@ var commonStrings; var catStrings; //// parent interfaces may call this -function default_focus() { $('scanbox').focus(); } +function default_focus() { document.getElementById('scanbox').focus(); } //// function my_init() { @@ -312,22 +312,16 @@ function handle_change() { } } if (eligibles.length > 0) { - if (window.confirm( - eligibles.length == 1 - ? catStrings.getFormattedString( - 'staff.cat.manage_multi_bib_items.prompt.confirm.peer_type_updated.singular', - [ data.hash.bpt[ $('bpt_menu').value ].name() ] - ) - : catStrings.getFormattedString( - 'staff.cat.manage_multi_bib_items.prompt.confirm.peer_type_updated.plural', - [ data.hash.bpt[ $('bpt_menu').value ].name(), eligibles.length ] - )) - ) { + var new_peer_type = widget_prompt( $('bpt_menu').cloneNode(true), { + 'title' : catStrings.getString('staff.cat.manage_multi_bib_items.prompt.title') + }); + + if (new_peer_type) { var bpbcm_list = []; for (var i = 0; i < eligibles.length; i++) { var obj = rows[ bpbcm_barcode_map[ eligibles[i] ] ].row.my.bpbcm; obj.ischanged(1); - obj.peer_type( $('bpt_menu').value ); + obj.peer_type( new_peer_type ); bpbcm_list.push( obj ); } var pcrud = new openils.PermaCrud( { authtoken :ses() }); @@ -345,7 +339,7 @@ function handle_change() { for (var i = 0; i < ids.length; i++) { var bpbcm_id = ids[i]; try { - rows[ bpbcm_barcode_map[ bpbcm_id ] ].row.my.bpbcm.peer_type( $('bpt_menu').value ); + rows[ bpbcm_barcode_map[ bpbcm_id ] ].row.my.bpbcm.peer_type( new_peer_type ); rows[ bpbcm_barcode_map[ bpbcm_id ] ].row.my.result = catStrings.getString('staff.cat.manage_multi_bib_items.result.column.value.peer_type_updated'); list.refresh_row( rows[ bpbcm_barcode_map[ bpbcm_id ] ] ); } catch(E) { diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties b/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties index ae781b02c4..51e080f91e 100644 --- a/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties +++ b/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties @@ -17,10 +17,7 @@ staff.cat.manage_multi_bib_items.result.column.value.failed=Failed staff.cat.manage_multi_bib_items.result.column.value.item_linked_to_bib=Item linked to bib staff.cat.manage_multi_bib_items.result.column.value.item_native_to_bib=Item native to bib staff.cat.manage_multi_bib_items.result.column.value.peer_type_updated=Peer Type updated -# %1$s = Peer Type -staff.cat.manage_multi_bib_items.prompt.confirm.peer_type_updated.singular=Change peer type on selected item to %1$s -# %1$s = Peer Type, %2$s = Number of selected items -staff.cat.manage_multi_bib_items.prompt.confirm.peer_type_updated.plural=Change peer type on %2$s selected items to %1$s +staff.cat.manage_multi_bib_items.prompt.title=Change Peer Type # %1$s = Bib Record ID staff.cat.manage_multi_bib_items.prompt.confirm.unlink_item_from_bib.singular=Unlink selected item from Bib %1$s # %1$s = Bib Record ID, %2$s = Number of selected items -- 2.11.0