[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. 2bb5080521c328bc94a8981c406c5c5ce4e2df76

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_1 has been updated
       via  2bb5080521c328bc94a8981c406c5c5ce4e2df76 (commit)
       via  246b0b376770102b838411604b4bdfbfc6ee30ed (commit)
      from  76af91530d7034ac50781867f14458924130286e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2bb5080521c328bc94a8981c406c5c5ce4e2df76
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Mon May 16 12:12:40 2011 -0400

    persist partial changes to new copies in vol/copy editor has new copies are gathered.
    
    In other words, you can do something like enter 5 in the "# of Copies" field, enter the first barcode (say b1), edit an attribute (say, set Circulate = No), and then enter a second barcode (b2).  Previously, the changes made to b1 would be lost as b2 was entered (or as other movement around the barcode entry textboxes happened) and both copies would get a Circulate = Yes, but now in this scenario, you would see 1 copy set to No and 1 copy set to Yes for the Circulate attribute.
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>

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 9656044..1aea205 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
@@ -875,6 +875,9 @@ g.gather_copies = function() {
 
         for (var i = 0; i < barcodes.length; i++) {
             var acp_id = barcodes[i].getAttribute('acp_id') || g.new_acp_id--;
+            if (acp_id < 0) {
+                barcodes[i].setAttribute('acp_id',acp_id);
+            }
             var ou_id = barcodes[i].getAttribute('ou_id');
             var callnumber_composite_key = barcodes[i].getAttribute('callkey');
             var barcode = barcodes[i].value;

commit 246b0b376770102b838411604b4bdfbfc6ee30ed
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Mon May 16 11:56:58 2011 -0400

    simpler language, and the behavior of this action is configurable
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 920db0d..9cf9140 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -2573,7 +2573,7 @@
 
 <!ENTITY staff.cat.copy_browser.holdings_maintenance.sel_patron.label "Show Last Few Circulations">
 <!ENTITY staff.cat.copy_browser.holdings_maintenance.sel_patron.accesskey "L">
-<!ENTITY staff.cat.copy_browser.holdings_maintenance.cmd_edit_items.label "Edit Item Attributes / Call Numbers / Replace Barcodes">
+<!ENTITY staff.cat.copy_browser.holdings_maintenance.cmd_edit_items.label "Edit Items">
 <!ENTITY staff.cat.copy_browser.holdings_maintenance.cmd_edit_items.accesskey "E">
 <!ENTITY staff.cat.copy_browser.holdings_maintenance.cmd_transfer_items.label "Transfer Items to Previously Marked Volume">
 <!ENTITY staff.cat.copy_browser.holdings_maintenance.cmd_transfer_items.accesskey "T">

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/web/opac/locale/en-US/lang.dtd            |    2 +-
 .../staff_client/server/cat/volume_copy_creator.js |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS