[open-ils-commits] r15814 - in trunk/Open-ILS/web: js/ui/default/vandelay opac/locale/en-US templates/default/vandelay/inc (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2010-03-11 18:38:32 -0500 (Thu, 11 Mar 2010)
New Revision: 15814

Modified:
   trunk/Open-ILS/web/js/ui/default/vandelay/vandelay.js
   trunk/Open-ILS/web/opac/locale/en-US/vandelay.dtd
   trunk/Open-ILS/web/templates/default/vandelay/inc/upload.tt2
Log:
added auto-overlay-exact option to queue import

Modified: trunk/Open-ILS/web/js/ui/default/vandelay/vandelay.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/vandelay/vandelay.js	2010-03-11 23:38:32 UTC (rev 15813)
+++ trunk/Open-ILS/web/js/ui/default/vandelay/vandelay.js	2010-03-11 23:38:32 UTC (rev 15814)
@@ -825,10 +825,16 @@
     if(type == 'auth')
         method = method.replace('bib', 'auth');
 
+    var options = {};
+    if(vlUploadQueueAutoOverlayExact.checked) {
+        options.auto_overlay_exact = true;
+        vlUploadQueueAutoOverlayExact.checked = false;
+    }
+
     fieldmapper.standardRequest(
         ['open-ils.vandelay', method],
         {   async: true,
-            params: [authtoken, queueId],
+            params: [authtoken, queueId, options],
             onresponse: function(r) {
                 var resp = r.recv().content();
                 if(e = openils.Event.parse(resp))
@@ -864,8 +870,12 @@
     currentType = dijit.byId('vl-record-type').getValue();
 
     var handleProcessSpool = function() {
-        if(vlUploadQueueAutoImport.checked) {
-            vlImportRecordQueue(currentType, currentQueueId, true,  
+        if(vlUploadQueueAutoImport.checked || vlUploadQueueAutoOverlayExact.checked) {
+
+            vlImportRecordQueue(
+                currentType, 
+                currentQueueId, 
+                vlUploadQueueAutoImport.checked,  
                 function() {
                     if(vlUploadQueueHoldingsImport.checked) {
                         vlImportHoldings(

Modified: trunk/Open-ILS/web/opac/locale/en-US/vandelay.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/vandelay.dtd	2010-03-11 23:38:32 UTC (rev 15813)
+++ trunk/Open-ILS/web/opac/locale/en-US/vandelay.dtd	2010-03-11 23:38:32 UTC (rev 15814)
@@ -2,6 +2,7 @@
 <!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.width "Auto Width">
 <!ENTITY vandelay.back.to.import.queue "Back To Import Queue">
 <!ENTITY vandelay.bib.attrs "Bibliographic attributes">

Modified: trunk/Open-ILS/web/templates/default/vandelay/inc/upload.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/vandelay/inc/upload.tt2	2010-03-11 23:38:32 UTC (rev 15813)
+++ trunk/Open-ILS/web/templates/default/vandelay/inc/upload.tt2	2010-03-11 23:38:32 UTC (rev 15814)
@@ -30,6 +30,12 @@
             </td>
         </tr>
         <tr>
+            <td>&vandelay.auto.import.auto_overlay_exact;</td>
+            <td colspan='4'>
+                <input jsId='vlUploadQueueAutoOverlayExact' dojoType='dijit.form.CheckBox'/>
+            </td>
+        </tr>
+        <tr>
             <td>Import Attached Holdings</td>
             <td colspan='4'>
                 <input jsId='vlUploadQueueHoldingsImport' dojoType='dijit.form.CheckBox'/>