[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. 112c25aae5897d211676d42dc850da6eebb4ec5d

[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  112c25aae5897d211676d42dc850da6eebb4ec5d (commit)
       via  bad8c8858ff2a39408aa4a7de7c24123e0f7f626 (commit)
      from  058a36754dabb834e49988b742521049c2c1c47d (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 112c25aae5897d211676d42dc850da6eebb4ec5d
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Tue Aug 16 11:22:36 2011 -0400

    Improve Vandelay Import/Merge Checkbox Labels
    
    Since these labels are used both for the initial import and also
    for imports from the queue, the use of the word "Auto" can be
    confusing and misleading.  This commit reflects changes already
    made in trunk for these labels.
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/web/opac/locale/en-US/vandelay.dtd b/Open-ILS/web/opac/locale/en-US/vandelay.dtd
index 31fdc67..4c9408b 100644
--- a/Open-ILS/web/opac/locale/en-US/vandelay.dtd
+++ b/Open-ILS/web/opac/locale/en-US/vandelay.dtd
@@ -1,10 +1,10 @@
 <!ENTITY vandelay.add.existing.queue "or Add to an Existing Queue">
 <!ENTITY vandelay.auth.attrs "Authority attributes">
 <!ENTITY vandelay.auth.records "Authority Records">
-<!ENTITY vandelay.auto.import.noncolliding "Auto-Import Non-Colliding Records">
-<!ENTITY vandelay.auto.import.auto_overlay_exact "Auto Merge/Overlay Exact Matches">
-<!ENTITY vandelay.auto.import.auto_overlay_1match "Auto Merge/Overlay When Exactly 1 Match is Found">
-<!ENTITY vandelay.auto.import.merge_profile "Merge/Overlay Profile">
+<!ENTITY vandelay.auto.import.noncolliding "Import Non-Matching Records">
+<!ENTITY vandelay.auto.import.auto_overlay_exact "Merge On Exact Match (901c)">
+<!ENTITY vandelay.auto.import.auto_overlay_1match "Merge On Single Match">
+<!ENTITY vandelay.auto.import.merge_profile "Merge Profile">
 <!ENTITY vandelay.auto.width "Auto Width">
 <!ENTITY vandelay.back.to.import.queue "Back To Import Queue">
 <!ENTITY vandelay.bib.attrs "Bibliographic attributes">

commit bad8c8858ff2a39408aa4a7de7c24123e0f7f626
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Tue Aug 16 11:03:16 2011 -0400

    Fix importing of 'No Match' records from a queue
    
    This small change honors the 'No Match' checkbox when importing
    from a queue.
    
    This bug has existed for a while, but was only recently exposed
    by 06e4d3370068002a303c9a5a03448ee0e1249fc0.  Before that commit,
    no-match records always imported, even when you didn't want them.
    After that commit, they import when wanted on the initial load,
    but could not be imported from the queue.
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/web/js/ui/default/vandelay/vandelay.js b/Open-ILS/web/js/ui/default/vandelay/vandelay.js
index 1ae7400..adadacf 100644
--- a/Open-ILS/web/js/ui/default/vandelay/vandelay.js
+++ b/Open-ILS/web/js/ui/default/vandelay/vandelay.js
@@ -863,6 +863,11 @@ function vlImportSelectedRecords() {
 
     var options = {overlay_map : currentOverlayRecordsMap};
 
+    if(vlUploadQueueImportNoMatch.checked) {
+        options.import_no_match = true;
+        vlUploadQueueImportNoMatch.checked = false;
+    }
+
     if(vlUploadQueueAutoOverlayExact.checked) {
         options.auto_overlay_exact = true;
         vlUploadQueueAutoOverlayExact.checked = false;

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

Summary of changes:
 Open-ILS/web/js/ui/default/vandelay/vandelay.js |    5 +++++
 Open-ILS/web/opac/locale/en-US/vandelay.dtd     |    8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS