From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Tue, 5 Jan 2016 22:47:01 +0000 (-0500)
Subject: Temporary modifications to My Account > Holds History until more
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e0d7dd285c8c86e4d1d4c19fdd55b6a489eed880;p=evergreen%2Fpines.git

Temporary modifications to My Account > Holds History until more
permanent fixes are developed.

Hid paging because it is broken. See:
https://bugs.launchpad.net/evergreen/+bug/1422927

Showing "Canceled" instead of "Active" for canceled holds. See:
https://bugs.launchpad.net/evergreen/+bug/1275118

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
---

diff --git a/Open-ILS/src/templates/opac/myopac/hold_history.tt2 b/Open-ILS/src/templates/opac/myopac/hold_history.tt2
index c2cfdbe72f..75b7447005 100644
--- a/Open-ILS/src/templates/opac/myopac/hold_history.tt2
+++ b/Open-ILS/src/templates/opac/myopac/hold_history.tt2
@@ -22,6 +22,7 @@
 
     <div class="header_middle">
         <span style="float:left;">[% l("Previously Requested Items") %]</span>
+		<!-- HIDE BECAUSE OF BUG
         <span class='float-left' style='padding-left: 10px;'>
             <a href='[% mkurl('hold_history', {limit => limit,offset => (offset - limit)}) %]'
                 [% IF offset == 0 %] class='invisible' [% END %]><span class="nav_arrow_fix">&#9668;</span>[% l('Previous') %]</a>
@@ -32,7 +33,7 @@
             %]
             [% curpage + 1 %]
                     [%- ELSE %]
-            <a href='[% mkurl('holds_history', {limit => limit, offset => (curpage * limit)}) %]'>[% curpage + 1 %]</a>
+            <a href='[% mkurl('hold_history', {limit => limit, offset => (curpage * limit)}) %]'>[% curpage + 1 %]</a>
                     [%- END;
                     curpage = curpage + 1;
                 END;
@@ -40,6 +41,7 @@
             <a href='[% mkurl('hold_history', {limit => limit, offset => (offset + limit)}) %]'
                [% IF count <= limit + offset %] class='invisible' [% END %] >[% l('Next') %]<span class="nav_arrow_fix">&#9658;</span></a>
         </span>
+		-->
         <span style="float:right;">
             <a class="hide_me" href="#">Export List</a>
         </span>
@@ -101,8 +103,11 @@
                             date.format(ctx.parse_datetime(ahr.thaw_date), DATE_FORMAT);
                         END %]
                     </td>
-                    <td>
-                        [% l(ahr.frozen == 'f' ? 'Active' : 'Suspended') %]
+                    <td>[% IF hold.hold.status != 6; %]
+					        [% l(ahr.frozen == 'f' ? 'Active' : 'Suspended') %]
+					    [% ELSE %]
+						    Canceled 
+						[% END %]
                     </td>
                     <td>
                         [% IF ahr.fulfillment_time;