[open-ils-commits] r16113 - in trunk/Open-ILS/xul/staff_client/server: circ locale/en-US (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2010-04-02 16:21:21 -0400 (Fri, 02 Apr 2010)
New Revision: 16113

Modified:
   trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js
   trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
Log:
flesh the copy location and set a tooltip for its flags

Modified: trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js	2010-04-02 20:21:20 UTC (rev 16112)
+++ trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js	2010-04-02 20:21:21 UTC (rev 16113)
@@ -146,6 +146,7 @@
         set("copy_id", '');
         set("loan_duration", '');
         set("location", '');
+        set_tooltip("location", '');
         set("renewal_type", '');
         set("opac_visible", '');
         set("price", '');
@@ -186,7 +187,17 @@
             set("holdable", details.copy.holdable()); 
             set("copy_id", details.copy.id()); 
             set("loan_duration", details.copy.loan_duration()); 
-            set("location", details.copy.location()); 
+            var copy_location = typeof details.copy.location() == 'object' ? details.copy.location() : data.lookup('acpl',details.copy.location());
+                set("location", copy_location.name());
+                set_tooltip("location", document.getElementById('circStrings').getFormattedString( 
+                    'staff.circ.copy_details.location_tooltip',
+                    [
+                        get_localized_bool( copy_location.circulate() ), 
+                        get_localized_bool( copy_location.holdable() ), 
+                        get_localized_bool( copy_location.hold_verify() ), 
+                        get_localized_bool( copy_location.opac_visible() )
+                    ]
+                ));
             set("opac_visible", details.copy.opac_visible()); 
             set("price", details.copy.price()); 
             set("ref", details.copy.ref()); 

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-04-02 20:21:20 UTC (rev 16112)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties	2010-04-02 20:21:21 UTC (rev 16113)
@@ -100,6 +100,8 @@
 staff.circ.copy_details.max_fine_rule_format=%1$s
 # From Config::rules::max_fine, 1 - Name, 2 - ID, 3 - Amount, 4 - Is Percent
 staff.circ.copy_details.max_fine_rule_tooltip_format=%3$s Is Percent? %4$s
+# From asset::copy_location: 1 - Can Circulate?  2 - Is Holdable?  3 - Hold Capture Requires Verification?  4 - Is OPAC Visible?
+staff.circ.copy_details.location_tooltip=Circulate? %1$s  Holdable? %2$s  Hold Verify? %3$s  OPAC Visible? %4$s
 staff.circ.copy_status.tab_name=Item Status
 staff.circ.copy_status.action.complete=Action complete.
 staff.circ.copy_status.sel_checkin.error=Checkin did not likely happen.