From 9dbe9dfe758aee64ffdd6fee85d535adb72bb35f Mon Sep 17 00:00:00 2001 From: phasefx Date: Fri, 11 Aug 2006 03:39:41 +0000 Subject: [PATCH] fixes git-svn-id: svn://svn.open-ils.org/ILS/trunk@5456 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/xul/staff_client/server/patron/holds.js | 8 ++++---- Open-ILS/xul/staff_client/server/patron/items.js | 9 ++++----- Open-ILS/xul/staff_client/server/patron/items_overlay.xul | 4 ++++ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/patron/holds.js b/Open-ILS/xul/staff_client/server/patron/holds.js index 3b3f568fd0..cd2df984ce 100644 --- a/Open-ILS/xul/staff_client/server/patron/holds.js +++ b/Open-ILS/xul/staff_client/server/patron/holds.js @@ -148,15 +148,15 @@ patron.holds.prototype = { ['command'], function() { JSAN.use('circ.util'); - circ.util.show_last_few_circs(obj.selection_list); + circ.util.show_last_few_circs(obj.retrieve_ids); } ], 'sel_copy_details' : [ ['command'], function() { JSAN.use('circ.util'); - for (var i = 0; i < obj.selection_list.length; i++) { - if (obj.selection_list[i].copy_id) circ.util.show_copy_details( obj.selection_list[i].copy_id ); + for (var i = 0; i < obj.retrieve_ids.length; i++) { + if (obj.retrieve_ids[i].copy_id) circ.util.show_copy_details( obj.retrieve_ids[i].copy_id ); } } ], @@ -550,7 +550,7 @@ patron.holds.prototype = { obj.holds_map[ hold.id() ] = hold; obj.list.append( { - 'retrieve_id' : js2JSON({'copy_id':hold.hold_type()=='C'?hold.target():null,'id':hold.id(),'type':hold.hold_type(),'target':hold.target(),'usr':hold.usr(),}), + 'retrieve_id' : js2JSON({'copy_id':hold.current_copy(),'id':hold.id(),'type':hold.hold_type(),'target':hold.target(),'usr':hold.usr(),}), 'row' : { 'my' : { 'ahr' : hold, diff --git a/Open-ILS/xul/staff_client/server/patron/items.js b/Open-ILS/xul/staff_client/server/patron/items.js index d4e40c3adc..dfccb27965 100644 --- a/Open-ILS/xul/staff_client/server/patron/items.js +++ b/Open-ILS/xul/staff_client/server/patron/items.js @@ -25,21 +25,20 @@ patron.items.prototype = { 'cmd_broken' : [ ['command'], function() { alert('Not Yet Implemented'); } ], 'sel_clip' : [ ['command'], function() { obj.list.clipboard(); } ], 'sel_clip2' : [ ['command'], function() { obj.list2.clipboard(); } ], - 'sel_patron' : [ ['command'], function() { JSAN.use('circ.util'); circ.util.show_last_few_circs(obj.selection_list); } ], + 'sel_patron' : [ ['command'], function() { JSAN.use('circ.util'); circ.util.show_last_few_circs(obj.retrieve_ids); } ], 'sel_copy_details' : [ ['command'], function() { JSAN.use('circ.util'); - for (var i = 0; i < obj.selection_list.length; i++) { circ.util.show_copy_details( obj.selection_list[i].copy_id ); } + for (var i = 0; i < obj.retrieve_ids.length; i++) { circ.util.show_copy_details( obj.retrieve_ids[i].copy_id ); } } ], - 'sel_patron2' : [ ['command'], function() { JSAN.use('circ.util'); circ.util.show_last_few_circs(obj.selection_list2); } ], + 'sel_patron2' : [ ['command'], function() { JSAN.use('circ.util'); circ.util.show_last_few_circs(obj.retrieve_ids2); } ], 'sel_copy_details2' : [ ['command'], function() { JSAN.use('circ.util'); - for (var i = 0; i < obj.selection_list2.length; i++) { circ.util.show_copy_details( obj.selection_list2[i].copy_id ); } + for (var i = 0; i < obj.retrieve_ids2.length; i++) { circ.util.show_copy_details( obj.retrieve_ids2[i].copy_id ); } } ], - 'cmd_items_print' : [ ['command'], function() { obj.items_print(1); } ], 'cmd_items_print2' : [ ['command'], function() { obj.items_print(2); } ], 'cmd_items_renew' : [ ['command'], function() { obj.items_renew(1); } ], diff --git a/Open-ILS/xul/staff_client/server/patron/items_overlay.xul b/Open-ILS/xul/staff_client/server/patron/items_overlay.xul index d4afebd5ed..886e961fcb 100644 --- a/Open-ILS/xul/staff_client/server/patron/items_overlay.xul +++ b/Open-ILS/xul/staff_client/server/patron/items_overlay.xul @@ -74,6 +74,8 @@ + + @@ -93,6 +95,8 @@ + + -- 2.11.0