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

[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  b7d2ca71c16b892104538902efd8c7e501229efd (commit)
       via  9605ec559972e16c6fc625788413ad54b0c1d534 (commit)
       via  78620f6c97ed88fa71444a61c06e5f5c34a9ef1e (commit)
      from  510d4febcbb666a6ca944470969e94e800f9de00 (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 b7d2ca71c16b892104538902efd8c7e501229efd
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Tue May 30 10:05:57 2017 -0400

    LP#1312824: follow-up to fix whitespace
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

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 87e1baf..024a0e6 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -4037,7 +4037,7 @@ sub change_hold_title {
     my $holds = $e->search_action_hold_request(
         [
             {
-	        capture_time     => undef,
+                capture_time     => undef,
                 cancel_time      => undef,
                 fulfillment_time => undef,
                 hold_type        => 'T',
@@ -4074,7 +4074,7 @@ sub change_hold_title_for_specific_holds {
     my $holds = $e->search_action_hold_request(
         [
             {
-	        capture_time     => undef,
+                capture_time     => undef,
                 cancel_time      => undef,
                 fulfillment_time => undef,
                 hold_type        => 'T',

commit 9605ec559972e16c6fc625788413ad54b0c1d534
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Fri May 19 11:38:53 2017 -0400

    LP#1312824: Change success message for transferred holds
    
    The holds transferred success message should clarify which holds were
    transferred to mitigate potential confusion.
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties b/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
index c321954..d5a3b2d 100644
--- a/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
@@ -285,7 +285,7 @@ staff.cat.opac.set_marc_edit.std_unexpected_error=Record not likely updated.
 staff.cat.opac.refresh.function_not_implemented.alert=Not yet implemented.  Work around: Choose Duplicate in New Tab option
 staff.cat.opac.set_tab_name=Record DB ID: %1$s
 staff.cat.opac.title_for_hold_transfer.destination_needed.label=Need to mark a record as a Title Hold Transfer Destination first.
-staff.cat.opac.title_for_hold_transfer.success.label=Holds transferred.
+staff.cat.opac.title_for_hold_transfer.success.label=All holds not available for pickup have been transferred.
 staff.cat.opac.title_for_hold_transfer.failure.label=Holds not transferred.
 staff.cat.opac.title_for_hold_transfer.many_bibs.warning=WARNING: Move selected holds from multiple bibs to single targeted bib?
 staff.cat.record_buckets.tab_name=Record Buckets

commit 78620f6c97ed88fa71444a61c06e5f5c34a9ef1e
Author: Jason Boyer <JBoyer1 at library.in.gov>
Date:   Fri Apr 25 12:45:34 2014 -0400

    LP1312824 open-ils.circ.hold.change_title fix
    
    Add a capture_time => undef limit to both change_title
    APIs to prevent currently captured holds from being reset
    when moving holds from one title to another.
    More work is needed to prevent items currently in transit
    from having their transits canceled.
    
    Test plan
    ---------
    1. Create a bib with multiple holdings
    2. Add multiple holds to this title and capture one of them - Item
       will have a status of On Holds Shelf
    3. Open another bib record, open Actions for this Record menu,
       Mark as Hold Transfer Destination
    4. Return to the record that has a captured hold, open Actions for
       this Record, Transfer all Title Holds
    5. Check Captured hold, Item status is Available, hold has been reset
       and now points to the new bib record.
    
    With the patch applied, steps 2-5 above should be repeated, but this
    time in step 5 the hold will still be on the original record and the
    item's status will still be On Holds Shelf.
    
    Signed-off-by: Jason Boyer <JBoyer1 at library.in.gov>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

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 1825c71..87e1baf 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -4037,6 +4037,7 @@ sub change_hold_title {
     my $holds = $e->search_action_hold_request(
         [
             {
+	        capture_time     => undef,
                 cancel_time      => undef,
                 fulfillment_time => undef,
                 hold_type        => 'T',
@@ -4073,6 +4074,7 @@ sub change_hold_title_for_specific_holds {
     my $holds = $e->search_action_hold_request(
         [
             {
+	        capture_time     => undef,
                 cancel_time      => undef,
                 fulfillment_time => undef,
                 hold_type        => 'T',

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

Summary of changes:
 .../perlmods/lib/OpenILS/Application/Circ/Holds.pm |    2 ++
 .../server/locale/en-US/cat.properties             |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS