[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch rel_2_6 updated. da1a8a21af791bbef15516ece2daf3dca2848d3c

[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_6 has been updated
       via  da1a8a21af791bbef15516ece2daf3dca2848d3c (commit)
       via  32baf3a92321a7eaa00a37556293f013e2e19300 (commit)
      from  49f6c103a4dc32fa875bf472288dad71035857d7 (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 da1a8a21af791bbef15516ece2daf3dca2848d3c
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Mon Jul 7 13:16:58 2014 -0400

    Fix currently harmless but still confusing sigil error
    
    get_org_descendants() returns an array ref, not a list, so it doesn't
    make sense to assign it to an '@orgs' variable.  Lucky for us, our
    where-parser treats this single element list containing the ref in the
    same manner as the proper ref itself, but at best, it is still very
    confusing to see.
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Serial.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Serial.pm
index d445250b..0247f4a 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Serial.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Serial.pm
@@ -123,13 +123,13 @@ sub bib_to_svr {
     }
 
     # ou_depth can be undef in get_org_descendants
-    my @orgs = $U->get_org_descendants($ou, $ou_depth);
+    my $orgs = $U->get_org_descendants($ou, $ou_depth);
 
     # TODO: 'deleted' ssub support
     my $sdists = $e->search_serial_distribution([
         {
             "+ssub" => {"record_entry" => $bib},
-            "holding_lib" => { "in" => @orgs }
+            "holding_lib" => { "in" => $orgs }
         },
         {
             "flesh" => 1,
@@ -143,7 +143,7 @@ sub bib_to_svr {
         {
             record => $bib,
             deleted => 'f',
-            "owning_lib" => { "in" => @orgs },
+            "owning_lib" => { "in" => $orgs },
             "+sdist" => {"id" => undef}
         },
         {

commit 32baf3a92321a7eaa00a37556293f013e2e19300
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Thu May 8 16:18:11 2014 -0400

    LP#1078787 Fix serial scoping in TPAC
    
    If you have generated holdings, but are not using the "compressed"
    display, your holdings show up regardless of scope.  This change
    limits the display to only sdists with a holding_lib in your current
    search scope.
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Serial.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Serial.pm
index 933f031..d445250b 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Serial.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Serial.pm
@@ -128,7 +128,8 @@ sub bib_to_svr {
     # TODO: 'deleted' ssub support
     my $sdists = $e->search_serial_distribution([
         {
-            "+ssub" => {"record_entry" => $bib}
+            "+ssub" => {"record_entry" => $bib},
+            "holding_lib" => { "in" => @orgs }
         },
         {
             "flesh" => 1,

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

Summary of changes:
 .../lib/OpenILS/Application/Search/Serial.pm       |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS