add Current Shelf Library column to xul interfaces

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 4a3b2a4..9c41675 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -2160,6 +2160,37 @@ circ.util.hold_columns = function(modify,params) {
         },
         {
             'persist' : 'hidden width ordinal',
+            'id' : 'current_shelf_lib',
+            'label' : document.getElementById('circStrings').getString('staff.circ.utils.current_shelf_lib'),
+            'flex' : 1,
+            'primary' : false,
+            'hidden' : true,
+            'editable' : false, 'render' : function(my) {
+                if (Number(my.ahr.current_shelf_lib())>=0) {
+                    return data.hash.aou[ my.ahr.current_shelf_lib() ].name();
+                } else {
+                    return my.ahr.current_shelf_lib().name();
+                }
+            }
+        },
+        {
+            'persist' : 'hidden width ordinal',
+            'id' : 'current_shelf_lib_shortname',
+            'label' : document.getElementById('commonStrings').getString('staff.ahr_current_shelf_lib_label'),
+            'flex' : 0,
+            'primary' : false,
+            'hidden' : true,
+            'editable' : false, 'render' : function(my) {
+                if (Number(my.ahr.current_shelf_lib())>=0) {
+                    return data.hash.aou[ my.ahr.current_shelf_lib() ].shortname();
+                } else {
+                    return my.ahr.current_shelf_lib().shortname();
+                }
+            }
+        },
+
+        {
+            'persist' : 'hidden width ordinal',
             'id' : 'current_copy',
             'label' : document.getElementById('commonStrings').getString('staff.ahr_current_copy_label'),
             'flex' : 1,

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 c77579a..cf4ae70 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
@@ -338,6 +338,7 @@ staff.circ.utils.active=Active?
 staff.circ.utils.thaw_date=Activation Date
 staff.circ.utils.thaw_date.none=No Date
 staff.circ.utils.pickup_lib=Pickup Library (Full Name)
+staff.circ.utils.current_shelf_lib=Current Shelf Library (Full Name)
 staff.circ.utils.current_copy.none=No Copy
 staff.circ.utils.title.none=No Title?
 staff.circ.utils.author.none=No Author?

diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/common.properties b/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
index 4cac73a..612fbb1 100644 (file)
--- a/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
@@ -60,6 +60,7 @@ staff.ahr_phone_notify_label=Phone Notify
 staff.ahr_sms_notify_label=Text Notify
 staff.ahr_sms_carrier_label=Text Carrier
 staff.ahr_pickup_lib_label=Pickup Library
+staff.ahr_current_shelf_lib_label=Current Shelf Library
 staff.ahr_prev_check_time_label=Previous Check Time
 staff.ahr_requestor_label=Requestor
 staff.ahr_selection_depth_label=Selection Depth