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

[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  2119df527e881f81b6ce4d8ed3fef71c247a1cd2 (commit)
      from  9c0d4beb484bb268c8ed8db0d4725d420305fdfc (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 2119df527e881f81b6ce4d8ed3fef71c247a1cd2
Author: Bill Erickson <berick at esilibrary.com>
Date:   Wed Oct 19 17:17:41 2011 -0400

    TPac; use canned get_hold_status call for history UI
    
    For consistency, use the same get_hold_status BLOCK to determine holds
    status display in the holds history UI.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>

diff --git a/Open-ILS/src/templates/opac/myopac/hold_history.tt2 b/Open-ILS/src/templates/opac/myopac/hold_history.tt2
index e48c2f8..d57fd63 100644
--- a/Open-ILS/src/templates/opac/myopac/hold_history.tt2
+++ b/Open-ILS/src/templates/opac/myopac/hold_history.tt2
@@ -1,7 +1,8 @@
 [%  PROCESS "opac/parts/header.tt2";
     PROCESS "opac/parts/misc_util.tt2";
+    PROCESS "opac/parts/hold_status.tt2";
     WRAPPER "opac/parts/myopac/base.tt2";
-    myopac_page = "holds"  
+    myopac_page = "holds";
     limit = ctx.hold_history_limit;
     offset = ctx.hold_history_offset;
 %]
@@ -98,23 +99,7 @@
                     <td width="110">
                         <div name="acct_holds_status"
                             style="margin-top:10px;margin-bottom:10px;">
-                            [%
-                                IF hold.hold.status == 4;
-                                    l("Available");
-                                    IF ahr.shelf_expire_time;
-                                        l('<br/>Expires [_1]', 
-                                            date.format(ctx.parse_datetime(ahr.shelf_expire_time), DATE_FORMAT));
-                                    END;
-                                ELSIF hold.hold.estimated_wait AND hold.hold.estimated_wait > 0;
-                                    # estimated wait is delivered as seconds.
-                                    SET hwait = POSIX.ceil(hold.hold.estimated_wait / 86400);
-                                    l("Estimated wait: [quant,_1,day,days]", hwait);
-                                ELSIF hold.hold.status == 3;
-                                    l("In Transit");
-                                ELSIF hold.hold.status < 3;
-                                    l("Waiting for copy");
-                                END;
-                            %]
+                            [% PROCESS get_hold_status hold=hold; %]
                         </div>
                     </td>
                 </tr>

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

Summary of changes:
 .../src/templates/opac/myopac/hold_history.tt2     |   21 ++-----------------
 1 files changed, 3 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
Evergreen ILS