[open-ils-commits] [GIT] Evergreen ILS branch rel_2_0 updated. 2b807e13f408dc09262b1cb84a96c31d9fb7385a

[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_0 has been updated
       via  2b807e13f408dc09262b1cb84a96c31d9fb7385a (commit)
      from  06ad5407984b528cedf9eeddbec50072981a6921 (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 2b807e13f408dc09262b1cb84a96c31d9fb7385a
Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Date:   Wed Feb 1 18:11:52 2012 -0500

    Booking: make pick up interface show resources captured for reservation ...
    
    ... even beyond the first day of the reservation.  I can think of no
    reason why this limitation existed in the first place.
    
    Also, just replace naive_start_of_day() with "today"
    
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Booking.pm b/Open-ILS/src/perlmods/OpenILS/Application/Booking.pm
index 5e75fa8..bb31f7d 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Booking.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Booking.pm
@@ -625,7 +625,6 @@ NOTES
 
 
 sub naive_ts_string {strftime("%F %T", localtime($_[0] || time));}
-sub naive_start_of_day {strftime("%F", localtime($_[0] || time))." 00:00:00";}
 
 # Return a map of bresv or an ilsevent on failure.
 sub get_uncaptured_bresv_for_brsrc {
@@ -1209,7 +1208,7 @@ sub get_captured_reservations {
                     "usr" => $patron->id,
                     "capture_time" => {"!=" => undef},
                     "pickup_time" => undef,
-                    "start_time" => {">=" => naive_start_of_day()},
+                    "start_time" => {"!=" => undef},
                     "cancel_time" => undef
                 },
                 $bresv_flesh
@@ -1230,7 +1229,7 @@ sub get_captured_reservations {
             return $e->search_booking_reservation([
                 {
                     "usr" => $patron->id,
-                    "return_time" => {">=" => naive_start_of_day()},
+                    "return_time" => {">=" => "today"},
                     "cancel_time" => undef
                 },
                 $bresv_flesh

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

Summary of changes:
 .../src/perlmods/OpenILS/Application/Booking.pm    |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS