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

[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  54e21a00ecb7d04149f63ee9829056a6c2081958 (commit)
      from  4b5b791fffef5420e6d142964dfefdb647051e22 (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 54e21a00ecb7d04149f63ee9829056a6c2081958
Author: Jason Boyer <jboyer1 at library.in.gov>
Date:   Fri Aug 14 11:26:54 2015 -0400

    LP 1481441: Improve Hold Failure Messages
    
    Rearranging the order of the various sources of hold
    failure messages makes it less likely to see spurious
    "Item is too new to transit this far" messages. Now
    errors due to excessive fines or number of existing
    holds.
    
    Signed-off-by: Jason Boyer <jboyer at library.in.gov>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>
    
    Conflicts:
    	Open-ILS/src/templates/opac/parts/place_hold_result.tt2

diff --git a/Open-ILS/src/templates/opac/parts/place_hold_result.tt2 b/Open-ILS/src/templates/opac/parts/place_hold_result.tt2
index 50c20dd..87fca56 100644
--- a/Open-ILS/src/templates/opac/parts/place_hold_result.tt2
+++ b/Open-ILS/src/templates/opac/parts/place_hold_result.tt2
@@ -88,8 +88,8 @@
                                                 # display:
                                                 (hdata.age_protect ?
                                                     l("All available copies are temporarily unavailable at your pickup library. Placing this hold could result in longer wait times.") :
-                                                    FAIL_PART_MSG_MAP.$fail_part_key ||
                                                     EVENT_MSG_MAP.$event_key ||
+                                                    FAIL_PART_MSG_MAP.$fail_part_key ||
                                                     (hdata.hold_failed_event.desc ? l(hdata.hold_failed_event.desc) : '') ||
                                                     hdata.hold_failed_event.payload.fail_part ||
                                                     hdata.hold_failed_event.textcode ||

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

Summary of changes:
 .../src/templates/opac/parts/place_hold_result.tt2 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS