From: erickson Date: Thu, 26 Mar 2009 15:58:06 +0000 (+0000) Subject: provide a little more flexibility to the caller of open-ils.trigger.events_by_target... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=38e450e69cdbaf106a7a77f54bc62f343a494436;p=evergreen%2Ftadl.git provide a little more flexibility to the caller of open-ils.trigger.events_by_target by allowing flesh fields to be passed in git-svn-id: svn://svn.open-ils.org/ILS/trunk@12687 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm index 2091198b71..456de11ebc 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm @@ -3210,7 +3210,9 @@ sub user_events { } my $ses = OpenSRF::AppSession->create('open-ils.trigger'); - my $req = $ses->request('open-ils.trigger.events_by_target', $obj_type, $filters); + my $req = $ses->request('open-ils.trigger.events_by_target', + $obj_type, $filters, {atevdef => ['reactor', 'validator']}, 2); + while(my $resp = $req->recv) { my $val = $resp->content; $conn->respond($val) if $val; diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Trigger.pm b/Open-ILS/src/perlmods/OpenILS/Application/Trigger.pm index 288b6a7668..f84ef2acf2 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Trigger.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Trigger.pm @@ -137,6 +137,8 @@ sub events_by_target { my $client = shift; my $object = shift; my $filter = shift || {}; + my $flesh_fields = shift || {}; + my $flesh_depth = shift || 1; my $obj_class = ref($object) || _fm_class_by_hint($object); my $obj_hint = ref($object) ? _fm_hint_by_class(ref($object)) : $object; @@ -209,10 +211,12 @@ sub events_by_target { my $events = $e->json_query($query); + $flesh_fields->{atev} = ['event_def'] unless $flesh_fields->{atev}; + for my $id (@$events) { my $event = $e->retrieve_action_trigger_event([ $id->{id}, - {flesh => 1, flesh_fields => {atev => ['event_def']}} + {flesh => $flesh_depth, flesh_fields => $flesh_fields} ]); (my $meth = $obj_class) =~ s/^Fieldmapper:://o;