[open-ils-commits] r16208 - in branches/rel_1_6: . Open-ILS/src/perlmods/OpenILS/Application/Circ (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2010-04-12 11:30:42 -0400 (Mon, 12 Apr 2010)
New Revision: 16208

Modified:
   branches/rel_1_6/
   branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
Log:
Backporting r16201: w/ in-db circ, if patron permit fails with no_item, continue on if this is a noncat checkout


Property changes on: branches/rel_1_6
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2010-04-08 10:51:35.668999910 -0400
committer: Mike Rylander <miker at esilibrary.com>
properties: 
	branch-nick: branches/rel_1_6

   + timestamp: 2010-04-12 10:56:29.252000093 -0400
committer: Mike Rylander <miker at esilibrary.com>
properties: 
	branch-nick: trunk

Name: bzr:file-ids
   - Open-ILS/src/perlmods/OpenILS/Application/Actor.pm	544 at dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk:Open-ILS%2Fsrc%2Fperlmods%2FOpenILS%2FApplication%2FActor.pm

   + Open-ILS/examples/templates/overdue_combined_xml.example	10306 at dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk:Open-ILS%2Fexamples%2Ftemplates%2Foverdue_combined_xml.example

Name: bzr:revision-id:v4
   - 11472 miker at esilibrary.com-20100408145135-kfykky6xsncu5taj

   + 11741 phasefx at batrepo-20091014063041-ama3i5s87ziqohxo
11742 phasefx at batrepo-20091014063644-pn3a6urkw3uxgr6n
12108 phasefx at batrepo-20091120084700-lavt73oserscgalf
12166 jason at esilibrary.com-20091202233906-g8kh2kh3qmmz66r1
12184 jason at esilibrary.com-20091204161020-0dqezh01c05btffh
12198 jason at esilibrary.com-20091208140008-eofwdbn2u8dxk2kk
12199 jason at esilibrary.com-20091208155412-4qdzy8sgs51vm0yq
12215 jason at esilibrary.com-20091209133642-bp8mb3tc5vpoc1ij
12220 jason at esilibrary.com-20091209143447-i1st1to8ln4hhwyb
12231 jason at esilibrary.com-20091209221438-vv4crqppm8ajj3dr
12804 jason at esilibrary.com-20100324194046-jza2ic2dlpq8txhc
12946 miker at esilibrary.com-20100402183612-8xznj35wfohk7zyu
12955 miker at esilibrary.com-20100403141037-h8d57ryrmkkg9yhb
12971 miker at whirly-20100405202254-aztbsf3p3eey9e8e
12997 miker at esilibrary.com-20100408154146-zodwuxxizwf0y449
13010 miker at miker-msi-20100409021618-5f0ohbg5cgi5pai0
13014 miker at esilibrary.com-20100409135406-mitf09aw1srnps3g
13022 miker at esilibrary.com-20100412144909-fc4bx1n80ac0z8ox
13023 miker at esilibrary.com-20100412145629-92g9jts2k8yqsm38

Name: bzr:text-parents
   - 
   + Open-ILS/examples/templates/overdue_combined_xml.example	svn-v4:dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk:14971


Modified: branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
===================================================================
--- branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm	2010-04-12 15:08:20 UTC (rev 16207)
+++ branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm	2010-04-12 15:30:42 UTC (rev 16208)
@@ -990,9 +990,12 @@
 
         my $results = $self->run_indb_circ_test;
         unless($self->circ_test_success) {
-            push(@allevents, OpenILS::Event->new(
-                $LEGACY_CIRC_EVENT_MAP->{$_->{fail_part}} || $_->{fail_part}
-                )) for @$results;
+            # no_item result is OK during noncat checkout
+            unless(@$results == 1 && $results->[0]->{fail_part} eq 'no_item' and $self->is_noncat) {
+                push(@allevents, OpenILS::Event->new(
+                    $LEGACY_CIRC_EVENT_MAP->{$_->{fail_part}} || $_->{fail_part}
+                    )) for @$results;
+            }
         }
 
     } else {