[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. 26d0bc0701527e5ab600a085fe165387f43b9c9a

[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_1 has been updated
       via  26d0bc0701527e5ab600a085fe165387f43b9c9a (commit)
       via  978f5ddff3ddfc5b6a1c4d2d5356ec6d1231f136 (commit)
      from  3185fc377b3005ca831813d77f8a5b9d4df40a7b (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 26d0bc0701527e5ab600a085fe165387f43b9c9a
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 dac99ae..1f4732e 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -667,9 +667,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 978f5ddff3ddfc5b6a1c4d2d5356ec6d1231f136
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 0b7adad..dac99ae 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -666,8 +666,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