[open-ils-commits] r20261 - in branches/rel_2_1/Open-ILS: src/perlmods/lib/OpenILS/Application/Circ xul/staff_client/server/circ (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2011-04-20 15:05:27 -0400 (Wed, 20 Apr 2011)
New Revision: 20261

Modified:
   branches/rel_2_1/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
   branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/checkin.js
   branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/checkout.js
   branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/renew.js
   branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/util.js
Log:
send the volume along in the payload for circ functions.  Render CN prefixes/suffixes correctly in xul lists if they're not fleshed


Modified: branches/rel_2_1/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
===================================================================
--- branches/rel_2_1/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm	2011-04-20 19:05:24 UTC (rev 20260)
+++ branches/rel_2_1/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm	2011-04-20 19:05:27 UTC (rev 20261)
@@ -236,6 +236,7 @@
                         $circulator->editor->update_asset_copy($copy);
                         $success_event->{"payload"}->{"record"} =
                             $U->record_to_mvr($copy->call_number->record);
+                        $success_event->{"payload"}->{"volume"} = $copy->call_number;
                         $copy->call_number($copy->call_number->id);
                         $success_event->{"payload"}->{"copy"} = $copy;
                     }
@@ -1497,6 +1498,7 @@
         OpenILS::Event->new('SUCCESS',
             payload  => {
                 copy             => $U->unflesh_copy($self->copy),
+                volume           => $self->volume,
                 circ             => $self->circ,
                 record           => $record,
                 holds_fulfilled  => $self->fulfilled_holds,
@@ -3189,6 +3191,7 @@
 
         my $payload         = {};
         $payload->{copy}    = $U->unflesh_copy($self->copy);
+        $payload->{volume}  = $self->volume;
         $payload->{record}  = $record,
         $payload->{circ}    = $self->circ;
         $payload->{transit} = $self->transit;

Modified: branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/checkin.js
===================================================================
--- branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/checkin.js	2011-04-20 19:05:24 UTC (rev 20260)
+++ branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/checkin.js	2011-04-20 19:05:27 UTC (rev 20261)
@@ -613,6 +613,7 @@
                     'mbts' : checkin.circ ? checkin.circ.billable_transaction().summary() : null,
                     'mvr' : checkin.record,
                     'acp' : checkin.copy,
+                    'acn' : checkin.volume,
                     'au' : checkin.patron,
                     'status' : checkin.status,
                     'route_to' : checkin.route_to,

Modified: branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/checkout.js
===================================================================
--- branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/checkout.js	2011-04-20 19:05:24 UTC (rev 20260)
+++ branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/checkout.js	2011-04-20 19:05:27 UTC (rev 20261)
@@ -426,7 +426,8 @@
                                     'my' : {
                                     'circ' : checkout.payload.circ,
                                     'mvr' : checkout.payload.record,
-                                    'acp' : checkout.payload.copy
+                                    'acp' : checkout.payload.copy,
+                                    'acn' : checkout.payload.volume
                                     }
                                 },
                                 'to_top' : true

Modified: branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/renew.js
===================================================================
--- branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/renew.js	2011-04-20 19:05:24 UTC (rev 20260)
+++ branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/renew.js	2011-04-20 19:05:27 UTC (rev 20261)
@@ -354,6 +354,7 @@
                         'mbts' : renew.parent_circ ? renew.parent_circ.billable_transaction().summary() : null,
                         'mvr' : renew.record,
                         'acp' : renew.copy,
+                        'acn' : renew.volume,
                         'au' : renew.patron,
                         'status' : renew.status,
                         'route_to' : renew.route_to,

Modified: branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/util.js
===================================================================
--- branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/util.js	2011-04-20 19:05:24 UTC (rev 20260)
+++ branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/util.js	2011-04-20 19:05:27 UTC (rev 20261)
@@ -639,7 +639,9 @@
             'hidden' : true,
             'editable' : false, 'render' : function(my) {
                 if (typeof my.acn == 'undefined') return '';
-                return (typeof my.acn.prefix() == 'object') ? my.acn.prefix().label() : my.acn.prefix();
+                return (typeof my.acn.prefix() == 'object')
+                    ? my.acn.prefix().label()
+                    : data.hash.acnp[ my.acn.prefix() ].label();
             },
             'persist' : 'hidden width ordinal'
         },
@@ -652,7 +654,9 @@
             'hidden' : true,
             'editable' : false, 'render' : function(my) {
                 if (typeof my.acn == 'undefined') return '';
-                return (typeof my.acn.suffix() == 'object') ? my.acn.suffix().label() : my.acn.suffix();
+                return (typeof my.acn.suffix() == 'object')
+                    ? my.acn.suffix().label()
+                    : data.hash.acns[ my.acn.suffix() ].label();
             },
             'persist' : 'hidden width ordinal'
         },
@@ -2501,11 +2505,12 @@
         JSAN.use('util.date');
         JSAN.use('util.sound'); var sound = new util.sound();
 
-        error.sdump('D_DEBUG','check = ' + error.pretty_print( js2JSON( check ) ) );
+        dump('check = ' + error.pretty_print( js2JSON( check ) ) + '\n' );
 
         check.message = check.textcode;
 
         if (check.payload && check.payload.copy) { check.copy = check.payload.copy; }
+        if (check.payload && check.payload.volume) { check.volume = check.payload.volume; }
         if (check.payload && check.payload.record) { check.record = check.payload.record; }
         if (check.payload && check.payload.circ) { check.circ = check.payload.circ; }
         if (check.payload && check.payload.patron) { check.patron = check.payload.patron; }