[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. b78cdbe029cc1df6143329f490e984a57b0b31bb

[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_1 has been updated
       via  b78cdbe029cc1df6143329f490e984a57b0b31bb (commit)
      from  98dee37e088dd8d45fa98de3378462d23a09994a (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 b78cdbe029cc1df6143329f490e984a57b0b31bb
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Thu Dec 8 11:26:33 2011 -0500

    Show Suspended holds as Suspended
    
    In the staff client and JSPac show the status of a suspended hold as
    Suspended rather than something like "Waiting for copy".
    
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
index 83c55a6..58160db 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -975,6 +975,7 @@ Returns event on error or:
  4 for 'arrived',
  5 for 'hold-shelf-delay'
  6 for 'canceled'
+ 7 for 'suspended'
 END_OF_DESC
         }
     }
@@ -1001,6 +1002,9 @@ sub _hold_status {
     if ($hold->cancel_time) {
         return 6;
     }
+    if ($U->is_true($hold->frozen)) {
+        return 7;
+    }
 	return 1 unless $hold->current_copy;
 	return 2 unless $hold->capture_time;
 
diff --git a/Open-ILS/web/opac/locale/en-US/opac.dtd b/Open-ILS/web/opac/locale/en-US/opac.dtd
index 6d71f51..7d6e460 100644
--- a/Open-ILS/web/opac/locale/en-US/opac.dtd
+++ b/Open-ILS/web/opac/locale/en-US/opac.dtd
@@ -210,6 +210,7 @@ avoid using bookbags all together.  Thank you.">
 <!ENTITY myopac.holds.status.waiting "Waiting for copy">
 <!ENTITY myopac.holds.status.intransit "In Transit">
 <!ENTITY myopac.holds.status.available "Ready for Pickup">
+<!ENTITY myopac.holds.status.suspended "Suspended">
 <!ENTITY myopac.holds.cancel "Cancel">
 <!ENTITY myopac.holds.verify "If you wish to cancel the selected hold, click OK, otherwise click Cancel.">
 <!ENTITY myopac.holds.freeze_selected "Suspend">
diff --git a/Open-ILS/web/opac/skin/default/js/myopac.js b/Open-ILS/web/opac/skin/default/js/myopac.js
index 638ed08..3ea4b02 100644
--- a/Open-ILS/web/opac/skin/default/js/myopac.js
+++ b/Open-ILS/web/opac/skin/default/js/myopac.js
@@ -477,7 +477,9 @@ function myOShowHoldStatus(r) {
 		hideMe($n(row, 'myopac_holds_cancel_link'));
 	}
 
-    if (showHoldQueuePosition) {
+    if( qstats.status == 7 ) {
+        unHideMe($n(row, 'hold_status_suspended'));
+    } else if (showHoldQueuePosition) {
         var node = $n(row, 'hold_qstats');
         if (qstats.potential_copies == 1) {
             node.appendChild(text(dojo.string.substitute(opac_strings.HOLD_STATUS_SINGULAR, [qstats.queue_position, qstats.total_holds, qstats.potential_copies])));
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
index 08d1690..5a07d9e 100644
--- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
@@ -85,6 +85,7 @@
 
 				<td name='myopac_holds_location'></td>
 				<td>
+					<span class='hide_me' name='hold_status_suspended'>&myopac.holds.status.suspended;</span>
 					<span class='hide_me' name='hold_status_waiting'>&myopac.holds.status.waiting;</span>
 					<span class='hide_me' name='hold_status_transit'>&myopac.holds.status.intransit;</span>
 					<span class='hide_me' name='hold_status_available'><b style='color:red'>&myopac.holds.status.available;</b></span>
diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 2f47464..d2fe5dc 100644
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -1941,6 +1941,9 @@ circ.util.hold_columns = function(modify,params) {
                     case 6:
                         return document.getElementById('circStrings').getString('staff.circ.utils.hold_status.6');
                         break;
+                    case 7:
+                        return document.getElementById('circStrings').getString('staff.circ.utils.hold_status.7');
+                        break;
                     default:
                         return my.status;
                         break;
diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
index 66ed6a3..423ec85 100644
--- a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
@@ -319,6 +319,7 @@ staff.circ.utils.hold_status.3=In-Transit
 staff.circ.utils.hold_status.4=Ready for pickup
 staff.circ.utils.hold_status.5=Reserved/Pending
 staff.circ.utils.hold_status.6=Canceled
+staff.circ.utils.hold_status.7=Suspended
 staff.circ.utils.hold_post_clear_shelf_action.label=Post-Clear
 staff.circ.utils.hold_post_clear_shelf_action.hold=Need for Hold
 staff.circ.utils.hold_post_clear_shelf_action.transit=Need for Transit

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

Summary of changes:
 .../perlmods/lib/OpenILS/Application/Circ/Holds.pm |    4 ++++
 Open-ILS/web/opac/locale/en-US/opac.dtd            |    1 +
 Open-ILS/web/opac/skin/default/js/myopac.js        |    4 +++-
 .../opac/skin/default/xml/myopac/myopac_holds.xml  |    1 +
 Open-ILS/xul/staff_client/server/circ/util.js      |    3 +++
 .../server/locale/en-US/circ.properties            |    1 +
 6 files changed, 13 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS