[open-ils-commits] [GIT] Evergreen ILS branch master updated. 61d6e6c1ebdb329629bed2e07fa0ac73873a02a3

[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, master has been updated
       via  61d6e6c1ebdb329629bed2e07fa0ac73873a02a3 (commit)
      from  cebafdee44ad18eb1ada3675e177e0c49b33b545 (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 61d6e6c1ebdb329629bed2e07fa0ac73873a02a3
Author: Mike Rylander <mrylander at gmail.com>
Date:   Mon Apr 16 10:29:05 2018 -0400

    LP#1745233: Don't test for LURIs during copy location searches
    
    When a user is searching with a copy location or location group filter,
    Located URIs should not be used to include records in the result set because
    they are not "within" a copy location.
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>
    Signed-off-by: Cesar Velez <cesar.velez at equinoxinitiative.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
index b3e64eb..981bff9 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
@@ -1455,13 +1455,15 @@ sub flatten {
     push @{$vis_filter{'c_attr'}},
         "search.calculate_visibility_attribute_test('circ_lib','{".join(',', @$dorgs)."}',$negate)";
 
-    my $lorgs = [@$aorgs];
-    my $luri_as_copy_gf = $U->get_global_flag('opac.located_uri.act_as_copy');
-    push @$lorgs, @$dorgs if ($luri_as_copy_gf and $U->is_true($luri_as_copy_gf->enabled));
+    if (!$self->find_filter('locations') && !$self->find_filter('location_groups')) {
+        my $lorgs = [@$aorgs];
+        my $luri_as_copy_gf = $U->get_global_flag('opac.located_uri.act_as_copy');
+        push @$lorgs, @$dorgs if ($luri_as_copy_gf and $U->is_true($luri_as_copy_gf->enabled));
 
-    $uses_bre = 1;
-    push @{$vis_filter{'b_attr'}},
-        "search.calculate_visibility_attribute_test('luri_org','{".join(',', @$lorgs)."}',$negate)";
+        $uses_bre = 1;
+        push @{$vis_filter{'b_attr'}},
+            "search.calculate_visibility_attribute_test('luri_org','{".join(',', @$lorgs)."}',$negate)";
+    }
 
     my @dlist = ();
     my $common = 0;

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

Summary of changes:
 .../Application/Storage/Driver/Pg/QueryParser.pm   |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Evergreen ILS