copying the item-config into the result object. fixed bug in capturing item config...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@9853 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/javascript/backend/circ/circ_item_config.js b/Open-ILS/src/javascript/backend/circ/circ_item_config.js
index 9cfd946..c54d0cc 100644 (file)
--- a/Open-ILS/src/javascript/backend/circ/circ_item_config.js
+++ b/Open-ILS/src/javascript/backend/circ/circ_item_config.js
@@ -51,7 +51,7 @@ var CIRC_MOD_MAP = {
 
 /* this will set defaults even if no one asked for them */
 log_debug("Calling getItemConfig() to force defaults..");
 
 /* this will set defaults even if no one asked for them */
 log_debug("Calling getItemConfig() to force defaults..");

-getItemConfig();
+result.item_config = getItemConfig();

 
 
 function getItemConfig() {
 
 
 function getItemConfig() {

diff --git a/Open-ILS/src/perlmods/OpenILS/SIP/Item.pm b/Open-ILS/src/perlmods/OpenILS/SIP/Item.pm
index a077786..3e3f7b9 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/SIP/Item.pm
+++ b/Open-ILS/src/perlmods/OpenILS/SIP/Item.pm
@@ -112,7 +112,7 @@ sub run_attr_script {
 sub magnetic {
     my $self = shift;
         return 0 unless $self->run_attr_script;
 sub magnetic {
     my $self = shift;
         return 0 unless $self->run_attr_script;

-        my $mag = $self->{item_config_result}->{magneticMedia};
+        my $mag = $self->{item_config_result}->{item_config}->{magneticMedia};

         syslog('LOG_DEBUG', "OILS: magnetic = $mag");
         return ($mag and $mag eq 't') ? 1 : 0;
 }
         syslog('LOG_DEBUG', "OILS: magnetic = $mag");
         return ($mag and $mag eq 't') ? 1 : 0;
 }


@@ -120,7 +120,7 @@ sub magnetic {
 sub sip_media_type {
     my $self = shift;
         return 0 unless $self->run_attr_script;
 sub sip_media_type {
     my $self = shift;
         return 0 unless $self->run_attr_script;

-        my $media = $self->{item_config_result}->{SIPMediaType};
+        my $media = $self->{item_config_result}->{item_config}->{SIPMediaType};

         syslog('LOG_DEBUG', "OILS: media type = $media");
         return ($media) ? $media : '001';
 }
         syslog('LOG_DEBUG', "OILS: media type = $media");
         return ($media) ? $media : '001';
 }