showing lineitem count in po summary, cleaned up some fetching code

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

diff --git a/Open-ILS/web/js/dojo/openils/acq/PO.js b/Open-ILS/web/js/dojo/openils/acq/PO.js
index 6e92d8c..795cd89 100644 (file)
--- a/Open-ILS/web/js/dojo/openils/acq/PO.js
+++ b/Open-ILS/web/js/dojo/openils/acq/PO.js
@@ -28,10 +28,10 @@ if(!dojo._hasResource['openils.acq.PO']) {
 
     openils.acq.PO.cache = {};
 
-    openils.acq.PO.retrieve = function(id, oncomplete) {
+    openils.acq.PO.retrieve = function(id, oncomplete, args) {
 
         var req = ['open-ils.acq', 'open-ils.acq.purchase_order.retrieve'];
-        var par = [openils.User.authtoken, id];
+        var par = [openils.User.authtoken, id, args];
 
         if(oncomplete) {
             fieldmapper.standardRequest(

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/view_po.js b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/view_po.js
index f55dac7..b3eed3f 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/view_po.js
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/view_po.js
@@ -52,8 +52,7 @@ function loadPOGrid() {
 function loadLIGrid() {
     if(liGrid.isLoaded) return;
 
-    function load(r) {
-        var po = r.recv().content();
+    function load(po) {
         lineitems = po.lineitems();
         var store = new dojo.data.ItemFileReadStore({data:jub.toStoreData(lineitems)});
         var model = new dojox.grid.data.DojoData(
@@ -61,13 +60,7 @@ function loadLIGrid() {
         JUBGrid.populate(liGrid, model, lineitems)
     }
 
-    fieldmapper.standardRequest(
-        ['open-ils.acq', 'open-ils.acq.purchase_order.retrieve'],
-        {   async: true,
-            params: [openils.User.authtoken, poId, {flesh_lineitems:1, clear_marc:1}], /* XXX PAGING */
-            oncomplete : load
-        }
-    );
+    openils.acq.PO.retrieve(poId, load, {flesh_lineitems:1, clear_marc:1});
     liGrid.isLoaded = true;
 }
 
@@ -80,7 +73,8 @@ function fetchPO() {
         function(po) {
             PO = po;
             loadPOGrid();
-        }
+        },
+        {flesh_lineitem_count:1}
     );
 }
 

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/view_po.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/view_po.html
index 8627719..0c354b1 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/view_po.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/view_po.html
@@ -28,7 +28,8 @@
                         {name: '${_("Ordering Agency")}', get:getOrgInfo},
                         {name: '${_("Create Time")}', field:'create_time', width:'auto', get:getDateTimeField},
                         {name: '${_("Edit Time")}', field: "edit_time", width:'auto', get:getDateTimeField},
-                        {name: '${_("Provider")}', get:getProvider, width:'auto'},
+                        {name: '${_("Provider")}', get:getProvider},
+                        {name: '${_("# Lineitems")}', field: 'lineitem_count'},
                         {name: '${_("State")}', field:'state'}
                     ]]
                 }];