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

[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  f6ad1af4d193ba0624f6a53f8b0e3091a7963da0 (commit)
      from  bb9685397f0815d8d7ddb2f8a8f19280a360d741 (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 f6ad1af4d193ba0624f6a53f8b0e3091a7963da0
Author: Bill Erickson <berick at esilibrary.com>
Date:   Fri Sep 14 15:30:15 2012 -0400

    Consistent permission filtering in ACQ search results
    
    Add permission checks to search result objects when calling unified
    search in 'idlist' mode, consistent with the existing permission checks
    for non-id-list mode.  Without this, different forms of the call return
    different sets of results.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Search.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Search.pm
index cbf4c73..d7e2608 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Search.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Search.pm
@@ -472,14 +472,10 @@ q/order_by clause must be of the long form, like:
     my $results = $e->json_query($query) or return $e->die_event;
     my @id_list = map { $_->{"id"} } (grep { $_->{"id"} } @$results);
 
-    if ($options->{"id_list"}) {
-        $conn->respond($_) foreach @id_list;
-    } else {
-        foreach(@id_list){
-            my $resp = $retriever->($e, $_, $options);
-            next if(ref($resp) ne "Fieldmapper::acq::$ret_type");
-            $conn->respond($resp);
-        }
+    foreach(@id_list){
+        my $resp = $retriever->($e, $_, $options);
+        next if(ref($resp) ne "Fieldmapper::acq::$ret_type");
+        $conn->respond($options->{"id_list"} ? $_ : $resp);
     }
 
     $e->disconnect;

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

Summary of changes:
 .../perlmods/lib/OpenILS/Application/Acq/Search.pm |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Evergreen ILS