From f5cf403035db490f5787f919156167ad5da394b9 Mon Sep 17 00:00:00 2001 From: erickson Date: Mon, 23 Jan 2006 17:37:14 +0000 Subject: [PATCH] moved to "environment" instead of "env". moved patron_info stuff into environment inserting objects read-only git-svn-id: svn://svn.open-ils.org/ILS/trunk@2796 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../javascript/backend/circ/circ_permit.js | 24 ++++++++++++------- .../OpenILS/Application/Circ/Circulate.pm | 17 +++++++------ 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/Open-ILS/src/javascript/backend/circ/circ_permit.js b/Open-ILS/src/javascript/backend/circ/circ_permit.js index c46600f459..4038563f3c 100644 --- a/Open-ILS/src/javascript/backend/circ/circ_permit.js +++ b/Open-ILS/src/javascript/backend/circ/circ_permit.js @@ -3,25 +3,31 @@ function go() { /* load the lib script */ load_lib('circ_lib.js'); + + +/* collect some useful variables */ +var standing = patron.standing.value.toLowerCase(); +var profile = patron.profile.name.toLowerCase(); +var status = copy.status.name.toLowerCase(); +var itemsOut = environment.patronItemsOut; +var fines = environment.patronFines; +var isRenewal = environment.isRenewal; + log_debug('CIRC PERMIT: permit circ on ' + ' Copy: ' + copy.id + ', Patron:' + patron.id + ', Patron Username:' + patron.usrname + ', Patron Profile: ' + patron.profile.name + ', Patron Standing: ' + patron.standing.value + - ', Patron copies: ' + patron_info.items_out + + ', Patron copies: ' + itemsOut + ', Patron Library: ' + patron.home_ou.name + - ', Patron fines: ' + patron_info.fines + + ', Patron fines: ' + fines + ', Copy status: ' + copy.status.name + ', Copy location: ' + copy.location.name + - ', Is Renewal: ' + ( (env.isRenewal) ? "yes" : "no" ) + + ', Is Renewal: ' + ( (isRenewal) ? "yes" : "no" ) + ''); -/* collect some useful variables */ -var standing = patron.standing.value.toLowerCase(); -var profile = patron.profile.name.toLowerCase(); -var status = copy.status.name.toLowerCase(); if( standing != 'good' ) return result.event = 'PATRON_BAD_STANDING'; @@ -38,10 +44,10 @@ if( status != 'available' && status != 'on holds shelf' ) -if( profile == 'patrons' && patron_info.items_out > 10 ) +if( profile == 'patrons' && itemsOut > 10 ) return result.event = 'PATRON_EXCEEDS_CHECKOUT_COUNT'; -if( profile == 'staff' && patron_info.items_out > 30 ) +if( profile == 'staff' && itemsOut > 30 ) return result.event = 'PATRON_EXCEEDS_CHECKOUT_COUNT'; diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm index a97f8bf3e0..69cde27cc6 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm @@ -186,21 +186,20 @@ sub _build_circ_script_runner { $runner->add_path( $_ ); } - $runner->insert( 'patron', $ctx->{patron} ); - $runner->insert( 'title', $ctx->{title} ); - $runner->insert( 'copy', $ctx->{copy} ); + $runner->insert( 'patron', $ctx->{patron}, 1); + $runner->insert( 'title', $ctx->{title}, 1); + $runner->insert( 'copy', $ctx->{copy}, 1); # circ script result $runner->insert( 'result', {} ); $runner->insert( 'result.event', 'SUCCESS' ); - $runner->insert('env', {}); - $runner->insert('env.isRenewal', 1) if $ctx->{isrenew}; + $runner->insert('environment', {}, 1); + $runner->insert('environment.isRenewal', 1) if $ctx->{isrenew}; if(ref($ctx->{patron_circ_summary})) { - $runner->insert( 'patron_info', {} ); - $runner->insert( 'patron_info.items_out', $ctx->{patron_circ_summary}->[0] ); - $runner->insert( 'patron_info.fines', $ctx->{patron_circ_summary}->[1] ); + $runner->insert( 'environment.patronItemsOut', $ctx->{patron_circ_summary}->[0], 1 ); + $runner->insert( 'environment.patronFines', $ctx->{patron_circ_summary}->[1], 1 ); } $ctx->{runner} = $runner; @@ -218,7 +217,7 @@ sub _add_script_runner_methods { my $key = shift; my $hold = $holdcode->fetch_open_hold_by_current_copy($ctx->{copy}->id); $hold = undef unless $hold; - $runner->insert( $key, $hold ); + $runner->insert( $key, $hold, 1 ); } ); } -- 2.43.2