[open-ils-commits] [GIT] Evergreen ILS branch rel_2_0 updated. 7bb8330f3924181234761829d15f365fc9dfc90a

[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  7bb8330f3924181234761829d15f365fc9dfc90a (commit)
      from  e86f5f02dab762619a21813d5fe153b3a2391176 (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 7bb8330f3924181234761829d15f365fc9dfc90a
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Tue Jan 17 11:13:15 2012 -0500

    Don't show estimated wait for negative estimates
    
    JSPac code was just checking for the truth of the estimated_wait return,
    but the estimated_wait return can be -1 under some circumstances.
    
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/web/opac/skin/default/js/myopac.js b/Open-ILS/web/opac/skin/default/js/myopac.js
index dee883a..992b7ea 100644
--- a/Open-ILS/web/opac/skin/default/js/myopac.js
+++ b/Open-ILS/web/opac/skin/default/js/myopac.js
@@ -461,7 +461,8 @@ function myOShowHoldStatus(r) {
 
 	var row = $("myopac_holds_row_" + r.hold.id());
 
-    if(qstats.estimated_wait || myopacShowHoldEstimate) {
+    // A note: estimated_wait may be -1 under some circumstances where it shouldn't be shown.
+    if((qstats.estimated_wait && qstats.estimated_wait > 0) || myopacShowHoldEstimate) {
         myopacShowHoldEstimate = true;
         if(qstats.estimated_wait) {
             // wait is currently returned in seconds, but displayed in days

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

Summary of changes:
 Open-ILS/web/opac/skin/default/js/myopac.js |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS