From d055cdc60c4b761d146a85209547a397677178f9 Mon Sep 17 00:00:00 2001 From: dbwells Date: Mon, 17 Jan 2011 19:29:14 +0000 Subject: [PATCH] In serial control, if they defined a *_call_number, honor it as the default git-svn-id: svn://svn.open-ils.org/ILS/trunk@19187 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../server/serial/manage_items.js | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/serial/manage_items.js b/Open-ILS/xul/staff_client/server/serial/manage_items.js index 30982f82c7..120fc5d337 100644 --- a/Open-ILS/xul/staff_client/server/serial/manage_items.js +++ b/Open-ILS/xul/staff_client/server/serial/manage_items.js @@ -359,16 +359,29 @@ serial.manage_items.prototype = { // now call numbers if (typeof call_numbers_by_issuance_id[item.issuance().id()] == 'undefined') { var default_cn = 'DEFAULT'; - // for now, let's default to the last created call number if there is one - // TODO: make this distribution specific - var acn_list = obj.network.request( - 'open-ils.pcrud', - 'open-ils.pcrud.search.acn', - [ ses(), {"record" : obj.docid, "owning_lib" : obj.holding_lib, "deleted" : 'f' }, {"order_by" : {"acn" : "create_date DESC"}, "limit" : "1" } ] - ); - - if (acn_list) { - default_cn = acn_list.label(); + // if they defined a *_call_number, honor it as the default + var preset_cn_id = item.stream().distribution()[obj.mode + '_call_number'](); + if (preset_cn_id) { + var preset_default_cn = obj.network.request( + 'open-ils.pcrud', + 'open-ils.pcrud.retrieve.acn', + [ ses(), preset_cn_id ] + ); + if (preset_default_cn) { + default_cn = preset_default_cn.label(); + } + } else { + // for now, let's default to the last created call number if there is one + // TODO: make this distribution specific + var acn_list = obj.network.request( + 'open-ils.pcrud', + 'open-ils.pcrud.search.acn', + [ ses(), {"record" : obj.docid, "owning_lib" : obj.holding_lib, "deleted" : 'f' }, {"order_by" : {"acn" : "create_date DESC"}, "limit" : "1" } ] + ); + + if (acn_list) { + default_cn = acn_list.label(); + } } var call_number = window.prompt('Please enter/adjust a call number ' + prompt_text, default_cn, //TODO: real default by setting -- 2.43.2