From: Jason Etheridge Date: Thu, 10 Mar 2011 10:39:45 +0000 (-0500) Subject: display item parts; flesh item parts for Item Status; Holdings Maintenance shows... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f02aea5c47b314734bffdf90ee36d2dbda4d7f23;p=evergreen%2Fequinox.git display item parts; flesh item parts for Item Status; Holdings Maintenance shows a filtered view of parts (based on the bib) --- diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm index 7040592193..88af4f55d8 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm @@ -973,7 +973,7 @@ sub copy_details { { flesh => 2, flesh_fields => { - acp => ['call_number'], + acp => ['call_number','parts'], acn => ['record','prefix','suffix','label_class'] } } diff --git a/Open-ILS/xul/staff_client/server/cat/copy_browser.js b/Open-ILS/xul/staff_client/server/cat/copy_browser.js index dce48629f3..58251a9930 100644 --- a/Open-ILS/xul/staff_client/server/cat/copy_browser.js +++ b/Open-ILS/xul/staff_client/server/cat/copy_browser.js @@ -1448,6 +1448,7 @@ cat.copy_browser.prototype = { var data = { 'row' : { 'my' : { + 'doc_id' : obj.docid, 'aou' : obj.data.hash.aou[ acn_tree.owning_lib() ], 'acn' : acn_tree, 'acp' : acp_item, @@ -1517,6 +1518,7 @@ cat.copy_browser.prototype = { 'circ_lib' : { 'hidden' : false }, 'owning_lib' : { 'hidden' : false }, 'call_number' : { 'hidden' : false }, + 'parts' : { 'hidden' : false }, 'due_date' : { 'hidden' : false }, 'acp_status' : { 'hidden' : false }, }, @@ -1530,6 +1532,7 @@ cat.copy_browser.prototype = { 'call_number', 'suffix', 'copy_number', + 'parts', 'location', 'barcode', 'loan_duration', diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js index 42ae218a34..231132fe07 100644 --- a/Open-ILS/xul/staff_client/server/circ/util.js +++ b/Open-ILS/xul/staff_client/server/circ/util.js @@ -669,7 +669,32 @@ circ.util.columns = function(modify,params) { }, 'persist' : 'hidden width ordinal' }, - + { + 'id' : 'parts', + 'fm_class' : 'acp', + 'label' : document.getElementById('commonStrings').getString('staff.acp_label_parts'), + 'flex' : 1, + 'sort_type' : 'number', + 'primary' : false, + 'hidden' : true, + 'editable' : false, 'render' : function(my) { + if (! my.acp.parts()) return ''; + var parts = my.acp.parts(); + var display_string = ''; + for (var i = 0; i < parts.length; i++) { + if (my.doc_id) { + if (my.doc_id == parts[i].record()) { + return parts[i].label(); + } + } else { + if (i != 0) display_string += ' : '; + display_string += parts[i].label(); + } + } + return display_string; + }, + 'persist' : 'hidden width ordinal' + }, { 'id' : 'copy_number', 'fm_class' : 'acp', 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 08c18a0642..467f5bb60d 100644 --- a/Open-ILS/xul/staff_client/server/locale/en-US/common.properties +++ b/Open-ILS/xul/staff_client/server/locale/en-US/common.properties @@ -37,6 +37,7 @@ staff.acp_label_circ_modifier=Circulation Modifier # %1$s = circ modifier code, %2$s = circ modifier name, %3$s = circ modifier description staff.circ_modifier.display=%1$s : %2$s : %3$s staff.acp_label_copy_number=Copy Number +staff.acp_label_parts=Part staff.acp_label_deposit_amount=Deposit Amount staff.acp_label_fine_level=Fine Level staff.acp_label_id=Copy ID