[open-ils-commits] [GIT] Evergreen ILS branch rel_2_3 updated. 9e7e9c0836972128f8a090dfc9cbe787c63c1b00

[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_3 has been updated
       via  9e7e9c0836972128f8a090dfc9cbe787c63c1b00 (commit)
       via  930c3729d62983e068656a3ef1c0ef352cabe750 (commit)
      from  99763db5938ddfd0995de278e072eb34fc25826d (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 9e7e9c0836972128f8a090dfc9cbe787c63c1b00
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 640525c..4101309 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
@@ -1268,8 +1268,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 930c3729d62983e068656a3ef1c0ef352cabe750
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 d80fbaf..640525c 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
@@ -1260,17 +1260,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