tweak hold "status" for canceled holds. And one whitespace fix

git-svn-id: svn://svn.open-ils.org/ILS/trunk@17035 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm
index f6361ea..ca35b33 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm
@@ -929,6 +929,7 @@ Returns event on error or:
  3 for 'in transit',
  4 for 'arrived',
  5 for 'hold-shelf-delay'
+ 6 for 'canceled'
 END_OF_DESC
         }
     }
@@ -952,6 +953,9 @@ sub retrieve_hold_status {
 
 sub _hold_status {
        my($e, $hold) = @_;
+    if ($hold->cancel_time) {
+        return 6;
+    }
        return 1 unless $hold->current_copy;
        return 2 unless $hold->capture_time;
 

diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 5c963f1..b31c523 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -1681,9 +1681,12 @@ circ.util.hold_columns = function(modify,params) {
                     case 4:
                         return document.getElementById('circStrings').getString('staff.circ.utils.hold_status.4');
                         break;
-                                        case 5:
+                    case 5:
                         return document.getElementById('circStrings').getString('staff.circ.utils.hold_status.5');
                         break;
+                    case 6:
+                        return document.getElementById('circStrings').getString('staff.circ.utils.hold_status.6');
+                        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 21626ee..c0ce402 100644 (file)
--- a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
@@ -314,6 +314,7 @@ staff.circ.utils.hold_status.2=Waiting for capture
 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_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