LP#1959405: hold status not looking for shelf delay status

This patch fixes the blank status display in the opac by treating that
status as a 'Waiting for Copy' status.  This commit covers both the TPAC
and the Bootstrap OPAC.

To Test:
As stated by Erica in LP1959405
1. Administration->Local Administration->Library Settins Editor
set Hold Shelf Status Delay to 1 minute.
2. Place a hold for a patron
3. Capture the hold.
   The opac will change from "Waiting for Copy" to a blank column.
4. Allow the delay interval to expire
   The opac will change from a blank status to "Available"

5. Apply the patch
6. Repeat 2-3.
   The opac will continue to display "Waiting for Copy"
7. Allow the delay interval to expire
   The opac will change from "Waiting for Copy" to "Available"

Signed-off-by: Garry Collum <gcollum@gmail.com>
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>

diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/hold_status.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/hold_status.tt2
index bb7f6cd..da1ed3d 100755 (executable)
--- a/Open-ILS/src/templates-bootstrap/opac/parts/hold_status.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/hold_status.tt2
@@ -45,13 +45,13 @@
      [% ELSIF hold.hold.status == 3 OR hold.hold.status == 8 %]
             <span class="myopac-transit"> [% l("In Transit") %] </span>
 
-     [% ELSIF hold.hold.status < 3 %]
+     [% ELSIF hold.hold.status < 3 OR hold.hold.status == 5 %]
             <span class="myopac-uncaptured-hold"> [% l("Waiting for copy") %] </span>
      [% END %]
    </div>
     <div>
         [% # Only show the count for holds that have not been captured
-           IF hold.hold.status < 3 OR hold.hold.status == 7 %]
+           IF hold.hold.status < 3 OR hold.hold.status == 5 OR hold.hold.status == 7 %]
              <span class="myopac-hold-count">
                 [% l('You are Hold #[_1] on [quant,_2, copy, copies]',
                    hold.hold.queue_position, hold.hold.potential_copies) | html %]

diff --git a/Open-ILS/src/templates/opac/parts/hold_status.tt2 b/Open-ILS/src/templates/opac/parts/hold_status.tt2
index fe5f271..b76fd9a 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/hold_status.tt2
+++ b/Open-ILS/src/templates/opac/parts/hold_status.tt2
@@ -45,13 +45,13 @@
      [% ELSIF hold.hold.status == 3 OR hold.hold.status == 8 %]
             <span class="myopac-transit"> [% l("In Transit") %] </span>
 
-     [% ELSIF hold.hold.status < 3 %]
+     [% ELSIF hold.hold.status < 3 OR hold.hold.status == 5 %]
             <span class="myopac-uncaptured-hold"> [% l("Waiting for copy") %] </span>
      [% END %]
     </div>
     <div>
         [% # Only show the count for holds that have not been captured
-           IF hold.hold.status < 3 OR hold.hold.status == 7 %]
+           IF hold.hold.status < 3 OR hold.hold.status == 5 OR hold.hold.status == 7 %]
              <span class="myopac-hold-count">
                 [% l('Hold #[_1] on [quant,_2, copy, copies]',
                    hold.hold.queue_position, hold.hold.potential_copies) | html %]