[open-ils-commits] [GIT] Evergreen ILS branch rel_2_10 updated. 11d618df05b4d82803dd1e73f4e8798178873e82

[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_10 has been updated
       via  11d618df05b4d82803dd1e73f4e8798178873e82 (commit)
      from  c980529a092609af40235f28b55390f4e1ffa415 (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 11d618df05b4d82803dd1e73f4e8798178873e82
Author: Josh Stompro <stomproj at larl.org>
Date:   Wed Mar 30 08:47:57 2016 -0500

    LP#1517556 - Exclude inactive event defs from find_event_def_by_hook.
    
    Currently when find_event_def_by_hook is called to find an appropriate
    event_def based on the hook, it doesn't exclude inactive event defs.  So
    strange behavior can happen if inactive event defs are present.
    
    I ran into this issue when I was trying out different versions of the self
    check receipt event def.  I had one ative and one inactive while I was
    troubleshooting, and when the system would grab the inactive event def by
    chance, the self check UI would freeze.  I think it is a resonable expectation
    that an event def marked inactive doesn't get used by the system.
    
    To test this out, clone one of the self check event defs, such as
    "Self-Checkout Items Out Receipt" and mark the copy as inactive.  Now
    go and trigger this event in the self check interface by attempting to
    print from the Items Out screen.  It should now fail 50% of the time, since
    both the active and inactive defs are returned.
    
    After the fix the inactive event def will always be excluded, so the action
    should no longer fail.
    
    Signed-off-by: Josh Stompro <stomproj at larl.org>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm
index 5f4714b..0fad7d9 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm
@@ -1672,7 +1672,7 @@ sub find_event_def_by_hook {
     for my $org_id (reverse @$orgs) {
 
         my $def = $e->search_action_trigger_event_definition(
-            {hook => $hook, owner => $org_id})->[0];
+            {hook => $hook, owner => $org_id, active => 't'})->[0];
 
         return $def if $def;
     }

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

Summary of changes:
 .../perlmods/lib/OpenILS/Application/AppUtils.pm   |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS