[open-ils-commits] [GIT] Evergreen ILS branch rel_2_10 updated. 505d70f0a006a54dc3c8d16ba25affe07ad5c0ff

[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_10 has been updated
       via  505d70f0a006a54dc3c8d16ba25affe07ad5c0ff (commit)
      from  a23e17d66f2287530aed4b7a3e7b21c38cb8c62e (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 505d70f0a006a54dc3c8d16ba25affe07ad5c0ff
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Fri Mar 4 20:51:04 2016 -0500

    LP#1576502 Fulfilled holds also should not display as active
    
    Once a hold has been fulfilled, the patron doesn't consider it active, so let's
    change the active status for those holds too.
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>
    Signed-off-by: Galen Charlton <gmc 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 3b8abb9..9aae602 100644
--- a/Open-ILS/src/templates/opac/myopac/hold_history.tt2
+++ b/Open-ILS/src/templates/opac/myopac/hold_history.tt2
@@ -60,7 +60,7 @@
                     <td><span>[% l('Author') %]</span></td>
                     <td> <span>[% l('Format') %]</span></td>
                     <td><span>[% l('Pickup Location') %]</span> </td>
-                    <td>[% l('Active On') %]</td>
+                    <td>[% l('Activate') %]</td>
                     <td>[% l('Active') %]</td>
                     <td>[% l('Date Fulfilled') %]</td>
                     <td><span>[% l('Status') %]</span></td>
@@ -102,11 +102,13 @@
                         END %]
                     </td>
                     <td>
-                        [% IF hold.hold.status == 6 %]
-                            [% l('Canceled') %]
-                        [% ELSE %]
-                            [% l(ahr.frozen == 'f' ? 'Active' : 'Suspended') %]
-                        [% END %]
+                        [% IF ahr.fulfillment_time;
+                             l('Fulfilled');
+                           ELSIF hold.hold.status == 6;
+                             l('Canceled'); 
+                           ELSE; 
+                             l(ahr.frozen == 'f' ? 'Active' : 'Suspended');
+                        END %]
                     </td>
                     <td>
                         [% IF ahr.fulfillment_time;

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

Summary of changes:
 .../src/templates/opac/myopac/hold_history.tt2     |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Evergreen ILS