[open-ils-commits] [GIT] Evergreen ILS branch rel_2_2 updated. 97fd7113783e0de46e826f994ad61b2ea7854459

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_2 has been updated
       via  97fd7113783e0de46e826f994ad61b2ea7854459 (commit)
       via  c327c1c08f247689aa020240240408f0610b0372 (commit)
      from  969dfd735415509d0fbcf65a4e3c8275d4462853 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 97fd7113783e0de46e826f994ad61b2ea7854459
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Thu Jul 12 11:42:21 2012 -0400

    Remove an extra ternary op
    
    And adjust the comment to make more sense. There is no higher level filter
    that prevents copy holds on parted items, so there is no filter for them to
    "slip through".
    
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
index 5c47b5e..83cd9f0 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
@@ -1253,8 +1253,8 @@ sub new_hold_copy_targeter {
 							isTrue($_->holdable) &&
 							!isTrue($_->deleted) &&
 							(isTrue($hold->mint_condition) ? isTrue($_->mint_condition) : 1) &&
-							( ($hold->hold_type ne 'C' && $hold->hold_type ne 'I') ? # Copy-ish holds can target if they slipped through
-								($hold->hold_type ne 'P' ? $_->part_maps->count == 0 : 1) : 1 )
+							( ( $hold->hold_type ne 'C' && $hold->hold_type ne 'I' # Copy-level holds don't care about parts
+								&& $hold->hold_type ne 'P' ) ? $_->part_maps->count == 0 : 1)
 						} @$all_copies;
 			}
 

commit c327c1c08f247689aa020240240408f0610b0372
Author: Mike Rylander <mrylander at gmail.com>
Date:   Wed Jun 13 09:37:54 2012 -0400

    Allow copy-ish holds to target, even for part-copies, if they somehow slip through the UI pre-checks
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
index ada8dc4..5c47b5e 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
@@ -1245,17 +1245,18 @@ sub new_hold_copy_targeter {
 				push @$all_copies, $_cp if $_cp;
 			}
 
-            # Force and recall holds bypass pretty much everything
-            if ($hold->hold_type ne 'R' && $hold->hold_type ne 'F') {
-    			# trim unholdables
-	    		@$all_copies = grep {	isTrue($_->status->holdable) && 
-		    				isTrue($_->location->holdable) && 
-			    			isTrue($_->holdable) &&
-				    		!isTrue($_->deleted) &&
-					    	(isTrue($hold->mint_condition) ? isTrue($_->mint_condition) : 1) &&
-						    ($hold->hold_type ne 'P' ? $_->part_maps->count == 0 : 1)
-    					} @$all_copies;
-            }
+			# Force and recall holds bypass pretty much everything
+			if ($hold->hold_type ne 'R' && $hold->hold_type ne 'F') {
+				# trim unholdables
+				@$all_copies = grep {	isTrue($_->status->holdable) && 
+							isTrue($_->location->holdable) && 
+							isTrue($_->holdable) &&
+							!isTrue($_->deleted) &&
+							(isTrue($hold->mint_condition) ? isTrue($_->mint_condition) : 1) &&
+							( ($hold->hold_type ne 'C' && $hold->hold_type ne 'I') ? # Copy-ish holds can target if they slipped through
+								($hold->hold_type ne 'P' ? $_->part_maps->count == 0 : 1) : 1 )
+						} @$all_copies;
+			}
 
 			# let 'em know we're still working
 			$client->status( new OpenSRF::DomainObject::oilsContinueStatus );

-----------------------------------------------------------------------

Summary of changes:
 .../Application/Storage/Publisher/action.pm        |   23 ++++++++++---------
 1 files changed, 12 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
Evergreen ILS