more work toward bib source selector

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_4@11539 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/vandelay/inc/upload.xml b/Open-ILS/web/vandelay/inc/upload.xml
index 8911c6c..71a8766 100644 (file)
--- a/Open-ILS/web/vandelay/inc/upload.xml
+++ b/Open-ILS/web/vandelay/inc/upload.xml
@@ -32,7 +32,7 @@
         <tr>
             <td>&vandelay.import.bib_sources;</td>
             <td>
-                <select jsId='vlUploadSourceSelector' dojoType='dijit.form.FilteringSelect'>
+                <select jsId='vlUploadSourceSelector' dojoType='dijit.form.FilteringSelect' labelAttr='source' searchAttr='source'>
                 </select>
             </td>
         </tr>

diff --git a/Open-ILS/web/vandelay/vandelay.js b/Open-ILS/web/vandelay/vandelay.js
index 4097765..af96999 100644 (file)
--- a/Open-ILS/web/vandelay/vandelay.js
+++ b/Open-ILS/web/vandelay/vandelay.js
@@ -123,9 +123,9 @@ function vlInit() {
     );
 
     fieldmapper.standardRequest(
-        ['open-ils.permacrud', 'open-ils.permacrud.search.cbs'],
+        ['open-ils.permacrud', 'open-ils.permacrud.search.cbs.atomic'],
         {   async: true,
-            params: [authtoken, {id:{"!=":null}}],
+            params: [authtoken, {id:{"!=":null}}, {order_by:{cbs:'id'}}],
             oncomplete : function(r) {
                 vlBibSources = openils.Util.readResponse(r, false, true);
                 checkInitDone();
@@ -845,7 +845,9 @@ function vlFleshQueueSelect(selector, type) {
 function vlShowUploadForm() {
     displayGlobalDiv('vl-marc-upload-div');
     vlFleshQueueSelect(vlUploadQueueSelector, vlUploadRecordType.getValue());
-    vlUploadSourceSelector.store = new dojo.data.ItemFileReadStore({data:cbs.toStoreData(vlBibSources)});
+    vlUploadSourceSelector.store = 
+        new dojo.data.ItemFileReadStore({data:cbs.toStoreData(vlBibSources, 'source')});
+    vlUploadSourceSelector.setValue(vlBibSources[0].id());
 }
 
 function vlShowQueueSelect() {