[open-ils-commits] r13338 - trunk/Open-ILS/src/perlmods/OpenILS/Application (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2009-06-08 09:49:11 -0400 (Mon, 08 Jun 2009)
New Revision: 13338

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
Log:
treat archived penalties as non-existent (unless explicitly retireved via pcrud)

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm	2009-06-06 10:41:13 UTC (rev 13337)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm	2009-06-08 13:49:11 UTC (rev 13338)
@@ -2682,6 +2682,10 @@
     # is it already applied?
     return 1 if $e->search_actor_user_standing_penalty(
         {   usr => $penalty->usr, 
+            '-or' => [
+                {stop_date => undef},
+                {stop_date => {'>' => 'now'}}
+            ],
             standing_penalty => $penalty->standing_penalty,
             org_unit => $penalty->org_unit
         })->[0];
@@ -2823,6 +2827,10 @@
         $user->standing_penalties(
             $e->search_actor_user_standing_penalty([
                 {   usr => $id, 
+                    '-or' => [
+                        {stop_date => undef},
+                        {stop_date => {'>' => 'now'}}
+                    ],
                     org_unit => $U->get_org_ancestors($e->requestor->ws_ou)
                 },
                 {   flesh => 1,