From f3a3b8e90098ea86e9ca88625e207bd6e3b100e1 Mon Sep 17 00:00:00 2001 From: phasefx Date: Fri, 10 Feb 2006 23:03:45 +0000 Subject: [PATCH] misc tweaks git-svn-id: svn://svn.open-ils.org/ILS/trunk@3028 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/xul/staff_client/server/circ/checkin.js | 2 -- Open-ILS/xul/staff_client/server/circ/util.js | 13 +++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/circ/checkin.js b/Open-ILS/xul/staff_client/server/circ/checkin.js index a7dde6a110..b4dccb51da 100644 --- a/Open-ILS/xul/staff_client/server/circ/checkin.js +++ b/Open-ILS/xul/staff_client/server/circ/checkin.js @@ -26,10 +26,8 @@ circ.checkin.prototype = { 'call_number' : { 'hidden' : false }, 'status' : { 'hidden' : false }, 'route_to' : { 'hidden' : false }, - 'message' : { 'hidden' : false, 'flex' : 3 }, } ); - dump('columns = ' + js2JSON(columns) + '\n'); JSAN.use('util.list'); obj.list = new util.list('checkin_list'); obj.list.init( diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js index 10623d4851..777cbf60d6 100644 --- a/Open-ILS/xul/staff_client/server/circ/util.js +++ b/Open-ILS/xul/staff_client/server/circ/util.js @@ -161,7 +161,7 @@ circ.util.hold_columns = function(modify) { }, { 'id' : 'current_copy', 'label' : getString('staff.ahr_current_copy_label'), 'flex' : 1, - 'primary' : false, 'hidden' : true, 'render' : 'my.ahr.current_copy()' + 'primary' : false, 'hidden' : true, 'render' : 'my.acp.barcode()' }, { 'id' : 'email_notify', 'label' : getString('staff.ahr_email_notify_label'), 'flex' : 1, @@ -267,12 +267,9 @@ circ.util.checkin_via_barcode = function(session,barcode,backdate) { [ session, params ] ); - check.message = check.textcode; + while(true) { /* only loops under certain conditions */ - /* FIXME - remove me later */ - //if (check.payload && check.payload.copy && typeof check.payload.copy.location() == 'object') { - // check.payload.copy.location( check.payload.copy.location().id() ); - //} + check.message = check.textcode; if (check.payload && check.payload.copy) check.copy = check.payload.copy; if (check.payload && check.payload.record) check.record = check.payload.record; @@ -332,6 +329,8 @@ circ.util.checkin_via_barcode = function(session,barcode,backdate) { case 0: /* captured */ var hold = this.hold_capture_via_copy_barcode( session, barcode, false ); + if (hold.ilsevent != 7007) { check = hold; continue; } + alert('something weird'); break; case 1: /* not captured */ @@ -347,6 +346,8 @@ circ.util.checkin_via_barcode = function(session,barcode,backdate) { } } + break; + } /* end of while */ // if (check.ilsevent != 0) { // switch(check.ilsevent) { // case '1': case 1: /* possible hold capture */ -- 2.43.2