[open-ils-commits] [GIT] Evergreen ILS branch master updated. 8d941d04b0f831c125e7c0b00ce03b25f680959e

[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  8d941d04b0f831c125e7c0b00ce03b25f680959e (commit)
       via  711f4252efc589836bbee08ae8ae9b7e31cb2516 (commit)
      from  1fd945019278c0fd05346aca4a88c0c94f0fae8a (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 8d941d04b0f831c125e7c0b00ce03b25f680959e
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue Oct 18 13:25:34 2011 -0400

    add a couple semicolons
    
    Not strictly required, but may as well save a picosecond
    of grief for the next person who adds to this code.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
index 60563f3..3265ae3 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -766,9 +766,9 @@ sub cancel_hold {
     $e->rollback;
 
     if ($e->requestor->id == $hold->usr) {
-        $U->create_events_for_hook('hold_request.cancel.patron', $hold, $hold->pickup_lib)
+        $U->create_events_for_hook('hold_request.cancel.patron', $hold, $hold->pickup_lib);
     } else {
-        $U->create_events_for_hook('hold_request.cancel.staff', $hold, $hold->pickup_lib)
+        $U->create_events_for_hook('hold_request.cancel.staff', $hold, $hold->pickup_lib);
     }
 
 	return 1;

commit 711f4252efc589836bbee08ae8ae9b7e31cb2516
Author: Bill Erickson <berick at esilibrary.com>
Date:   Thu Sep 15 13:38:17 2011 -0400

    Create events for hold_request.cancel.patron
    
    When a patron cancels his/her own hold, create events for the
    (already-existing) hold_request.cancel.patron A/T hook.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
index e3ec8b7..60563f3 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -765,8 +765,11 @@ sub cancel_hold {
     $hold = $e->retrieve_action_hold_request($hold->id) or return $e->die_event;
     $e->rollback;
 
-    $U->create_events_for_hook('hold_request.cancel.staff', $hold, $hold->pickup_lib)
-        if $e->requestor->id != $hold->usr;
+    if ($e->requestor->id == $hold->usr) {
+        $U->create_events_for_hook('hold_request.cancel.patron', $hold, $hold->pickup_lib)
+    } else {
+        $U->create_events_for_hook('hold_request.cancel.staff', $hold, $hold->pickup_lib)
+    }
 
 	return 1;
 }

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

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


hooks/post-receive
-- 
Evergreen ILS