From 9666704c15f15e23dfefd5b74cb8406a92980f61 Mon Sep 17 00:00:00 2001 From: Jason Etheridge Date: Tue, 8 Mar 2011 14:13:15 -0500 Subject: [PATCH] re-enable volume creation without items (and volume editing). Previously, if multiple volumes with the same label were specified for a single given org, they would essentially get merged into a single volume. This still happens, but with things like class, prefix, and suffix, the behavior is undefined if these are set on multiple rows for a "single" volume. FIXME --- Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js index b823f89899..6769e6c18c 100644 --- a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js +++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js @@ -877,11 +877,7 @@ g.stash_and_close = function(param) { } var dont_close = false; - if (copies.length > 0) { - JSAN.use('cat.util'); - if (param == 'edit') { - copies = cat.util.spawn_copy_editor( { 'edit' : true, 'docid' : g.doc_id, 'copies' : copies, 'caller_handles_update' : true }); - } + if (volumes.length > 0) { if (typeof xul_param('update_volume') == 'function') { xul_param('update_volume')(volumes); } else { @@ -893,6 +889,12 @@ g.stash_and_close = function(param) { g.error.standard_unexpected_error_alert('volume update',r); } } + } + if (copies.length > 0) { + if (param == 'edit') { + JSAN.use('cat.util'); + copies = cat.util.spawn_copy_editor( { 'edit' : true, 'docid' : g.doc_id, 'copies' : copies, 'caller_handles_update' : true }); + } if (typeof xul_param('update_copy') == 'function') { xul_param('update_copy')(copies); } else { -- 2.11.0