more dojo1.3 fixes

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

diff --git a/Open-ILS/web/js/ui/default/conify/global/acq/provider.js b/Open-ILS/web/js/ui/default/conify/global/acq/provider.js
index fe447e1..8900ed2 100644 (file)
--- a/Open-ILS/web/js/ui/default/conify/global/acq/provider.js
+++ b/Open-ILS/web/js/ui/default/conify/global/acq/provider.js
@@ -29,7 +29,7 @@ function draw() {
         drawProviderSummary();
     } else {
         console.log('in else block');
-        openils.Util.addCSSClass(dojo.byId('provider-details-div'), 'hidden');
+        openils.Util.removeCSSClass(dojo.byId('provider-details-div'), 'hidden');
         pListGrid.loadAll({order_by:{acqpro : 'name'}});       
         pListGrid.onPostCreate = function(fmObject) {
             location.href = location.href + '/' + fmObject.id();
@@ -41,7 +41,8 @@ function draw() {
 function drawProviderSummary(child) {
     console.log(child);
     openils.Util.addCSSClass(dojo.byId('provider-details-div'), 'visible');
-    console.log("hidden provider-details");
+    console.log('added provider.list.div');
+    console.log("drawing provider-details-div");
   
     var loadedTabs = {'provider-address' : true};
     if(child){   
@@ -54,25 +55,25 @@ function drawProviderSummary(child) {
             openils.Util.removeCSSClass(dojo.byId('contact-addr-div'), 'hidden');
             pcListGrid.resetStore();
             pcListGrid.loadAll( {oncomplete:function(r){
-            var count = 0; 
-            pcListGrid.store.fetch( {onComplete:function(list) { 
-                        count =  list.length
-                            if(count>=1){
-                                var contactIds = [];                           
-                                dojo.forEach(list, function(item) {
-                                        contactIds.push(pcListGrid.store.getValue(item, 'id')); }
-                                    );
-                                openils.Util.addCSSClass(dojo.byId('contact-addr-div'), 'visible');
-                                pcaListGrid.overrideEditWidgets.contact = new
-                                dijit.form.FilteringSelect({store: pcListGrid.store});
-                                pcaListGrid.resetStore();
-                                pcaListGrid.loadAll({order_by:{acqpca : 'contact'}}, {contact: contactIds});
-                            }else{ 
-                                return;
-                            }            
-                    }
-                }
-                );
+                        var count = 0; 
+                        pcListGrid.store.fetch( {onComplete:function(list) { 
+                                    count =  list.length
+                                        if(count>=1){
+                                            var contactIds = [];                           
+                                            dojo.forEach(list, function(item) {
+                                                    contactIds.push(pcListGrid.store.getValue(item, 'id')); }
+                                                );
+                                            openils.Util.addCSSClass(dojo.byId('contact-addr-div'), 'visible');
+                                            pcaListGrid.overrideEditWidgets.contact = new
+                                            dijit.form.FilteringSelect({store: pcListGrid.store});
+                                            pcaListGrid.resetStore();
+                                            pcaListGrid.loadAll({order_by:{acqpca : 'contact'}}, {contact: contactIds});
+                                        }else{ 
+                                            return;
+                                        }            
+                                }
+                            }
+                            );
                     }
                 }, {provider : providerId});
             

diff --git a/Open-ILS/web/templates/default/conify/global/acq/provider.tt2 b/Open-ILS/web/templates/default/conify/global/acq/provider.tt2
index a682e53..ca90bcb 100644 (file)
--- a/Open-ILS/web/templates/default/conify/global/acq/provider.tt2
+++ b/Open-ILS/web/templates/default/conify/global/acq/provider.tt2
@@ -1,45 +1,51 @@
 [% WRAPPER default/base.tt2 %]
 <script src='[% ctx.media_prefix %]/js/ui/default/conify/global/acq/provider.js'> </script>
 
-<script> 
+<script type="text/javascript"> 
     var providerId = '[% ctx.page_args.0 %]';
 
-    function formatName(inDatum) {
-        switch (inDatum) {
-            case 'owning_lib':
-                return 'Owning Library';
-            case 'quantity':
-                return 'Quantity';
-            case 'call_number':
-                return 'Call Number';
-            case 'fund_code':
-                return 'Fund Code';
-            case 'local_note':
-                return 'Local Note';
-            case 'price':
-                return 'Price';
-            case 'circ-Modifier':
-                return 'Circulation Modifier';
-            case 'copy_location':
-                return 'Copy Location';
-            case 'collection_code':
-                return 'Collection Code';
-        }
-    }
 
-    function getProviderName(rowIndex, item) {
-        if(!item) return '';
-        var name = this.grid.store.getValue(item, 'name');
-        var id = this.grid.store.getValue(item, 'id');
-        return id + ':' + name;
-    }
 
-    function formatName(value) {
-        if(value) {
-            var vals = value.split(/:/);
-            return '<a href="[% ctx.base_path %]/conify/global/acq/provider/'+vals[0]+'">'+vals[1]+'</a>';
-        }
+function formatName(inDatum) {
+    switch (inDatum) {
+    case 'owning_lib':
+        return 'Owning Library';
+    case 'quantity':
+        return 'Quantity';
+    case 'call_number':
+        return 'Call Number';
+    case 'fund_code':
+        return 'Fund Code';
+    case 'local_note':
+        return 'Local Note';
+    case 'price':
+        return 'Price';
+    case 'circ_modifier':
+        return 'Circulation Modifier';
+    case 'copy_location':
+        return 'Copy Location';
+    case 'collection_code':
+        return 'Collection Code';
+    }
+}
+
+function getProviderName(rowIndex, item) {
+    if(!item) return '';
+    var name = this.grid.store.getValue(item, 'name');
+    var id = this.grid.store.getValue(item, 'id');
+    return id + ':' + name;
+}
+
+function formatName(value) {
+    if(value) {
+        var vals = value.split(/:/);
+        return '<a href="[% ctx.base_path %]/conify/global/acq/provider/'+vals[0]+'">'+vals[1]+'</a>';
     }
+}
+
+
+
+
 </script>
 
 
@@ -80,7 +86,7 @@
                 <tr><th field='name' get='getProviderName' formatter='formatName'/></tr>
             </thead>
         </table>
-        <div/>
+        <div></div>
     </div>
 </div>
 
@@ -95,7 +101,7 @@
             <div>
             <button dojoType='dijit.form.Button' onClick='paListGrid.showCreateDialog()'>New Provider Address</button>
             <button dojoType='dijit.form.Button' onClick='paListGrid.deleteSelected()'>Delete Selected</button>
-        </div>
+            </div>
         </div>
         <div dojoType="dijit.layout.ContentPane" layoutAlign="client" style='height:100px'>
             <table  jsId="paListGrid"