add workstation-related circ columns and relabel Checkout Library to Checkout or...

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

diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index e2889c6..c9ae828 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -1231,7 +1231,27 @@ circ.util.columns = function(modify,params) {
             'flex' : 1,
             'primary' : false,
             'hidden' : true,
-            'editable' : false, 'render' : function(my) { return my.circ ? ( typeof my.circ.checkin_workstation() == 'object' ? my.circ.checkin_workstation().name() : my.circ.checkin_workstation() ) : ( my.acp.circulations() ? ( typeof my.acp.circulations()[0].checkin_workstation() == 'object' ? my.acp.circulations().checkin_workstation().name() : my.acp.circulations().checkin_workstation() ) : ""); },
+            'editable' : false, 'render' : function(my) { return my.circ ? ( typeof my.circ.checkin_workstation() == 'object' ? my.circ.checkin_workstation().name() : my.circ.checkin_workstation() ) : ""; },
+        },
+        {
+            'persist' : 'hidden width ordinal',
+            'fm_class' : 'circ',
+            'id' : 'checkout_workstation',
+            'label' : document.getElementById('circStrings').getString('staff.circ.utils.checkout_workstation'),
+            'flex' : 1,
+            'primary' : false,
+            'hidden' : true,
+            'editable' : false, 'render' : function(my) { return my.circ ? ( typeof my.circ.workstation() == 'object' ? my.circ.workstation().name() : my.circ.workstation() ) : ""; },
+        },
+        {
+            'persist' : 'hidden width ordinal',
+            'fm_class' : 'circ',
+            'id' : 'checkout_workstation_top_of_chain',
+            'label' : document.getElementById('circStrings').getString('staff.circ.utils.checkout_workstation_top_of_chain'),
+            'flex' : 1,
+            'primary' : false,
+            'hidden' : true,
+            'editable' : false, 'render' : function(my) { if (my.circ&&!my.original_circ) { if(!get_bool(my.circ.desk_renewal())&&!get_bool(my.circ.opac_renewal())&&!get_bool(my.circ.phone_renewal())){my.original_circ = my.circ;}}; return my.original_circ ? ( typeof my.original_circ.workstation() == 'object' ? my.original_circ.workstation().name() : my.original_circ.workstation() ) : ""; },
         },
         {
             'persist' : 'hidden width ordinal',

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 8fcbb93..69f3b56 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
@@ -239,7 +239,9 @@ staff.circ.utils.acp_mint_condition.true=Good
 staff.circ.utils.acp_mint_condition.false=Mediocre
 # The < and > highlight that the value is not set; translate Unset and change the delimiters as needed
 staff.circ.utils.unset=<Unset>
-staff.circ.utils.checkout_lib=Checkout Library
+staff.circ.utils.checkout_lib=Checkout or Renew Library
+staff.circ.utils.checkout_workstation=Circ or Renewal Workstation
+staff.circ.utils.checkout_workstation_top_of_chain=Checkout Workstation
 staff.circ.utils.checkout_timestamp=Checkout Timestamp
 staff.circ.utils.checkin_timestamp=Checkin Timestamp
 staff.circ.utils.xact_start=Checkout Date