[open-ils-commits] r17035 - in trunk/Open-ILS: src/perlmods/OpenILS/Application/Circ xul/staff_client/server/circ xul/staff_client/server/locale/en-US (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2010-07-26 14:09:10 -0400 (Mon, 26 Jul 2010)
New Revision: 17035

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm
   trunk/Open-ILS/xul/staff_client/server/circ/util.js
   trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
Log:
tweak hold "status" for canceled holds.  And one whitespace fix


Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm	2010-07-26 16:18:09 UTC (rev 17034)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm	2010-07-26 18:09:10 UTC (rev 17035)
@@ -929,6 +929,7 @@
  3 for 'in transit',
  4 for 'arrived',
  5 for 'hold-shelf-delay'
+ 6 for 'canceled'
 END_OF_DESC
         }
     }
@@ -952,6 +953,9 @@
 
 sub _hold_status {
 	my($e, $hold) = @_;
+    if ($hold->cancel_time) {
+        return 6;
+    }
 	return 1 unless $hold->current_copy;
 	return 2 unless $hold->capture_time;
 

Modified: trunk/Open-ILS/xul/staff_client/server/circ/util.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/util.js	2010-07-26 16:18:09 UTC (rev 17034)
+++ trunk/Open-ILS/xul/staff_client/server/circ/util.js	2010-07-26 18:09:10 UTC (rev 17035)
@@ -1681,9 +1681,12 @@
                     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;

Modified: trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties	2010-07-26 16:18:09 UTC (rev 17034)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties	2010-07-26 18:09:10 UTC (rev 17035)
@@ -314,6 +314,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_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