acq fund permacrud porting

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/src/templates/acq/fund/list.tt2 b/Open-ILS/src/templates/acq/fund/list.tt2
index 83f2320..c70e1a1 100644 (file)
--- a/Open-ILS/src/templates/acq/fund/list.tt2
+++ b/Open-ILS/src/templates/acq/fund/list.tt2
@@ -139,13 +139,12 @@
     </div>
 </div>
 
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client" style='height:80%'>
     <table  jsId="lfGrid"
             dojoType="openils.widget.AutoGrid"
             fieldOrder="['id', 'name', 'code', 'year', 'org', 'currency_type', 'combined_balance']"
             requiredFields="['name', 'code', 'year', 'org', 'currency_type']"
             query="{id: '*'}"
-            defaultCellWidth='"auto"'
             fmClass='acqf'
             showPaginator='true'
             editOnEnter='true'>

diff --git a/Open-ILS/web/js/ui/default/acq/financial/list_funds.js b/Open-ILS/web/js/ui/default/acq/financial/list_funds.js
index f9759fc..6da078a 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/financial/list_funds.js
+++ b/Open-ILS/web/js/ui/default/acq/financial/list_funds.js
@@ -31,13 +31,7 @@ var fundFleshFields = [
     'allocation_total'
 ];
 
-function getBalanceInfo(rowIndex, item) {
-    if(!item) return '';
-    return this.grid.store.getValue(item, this.field) || 0;
-}
-
 function initPage() {
-
     contextOrg = openils.User.user.ws_ou();
 
     var connect = function() {
@@ -87,11 +81,12 @@ function loadFundGrid(year) {
     var pcrud = new openils.PermaCrud();
     pcrud.search('acqf', 
         {   year : year, 
-            org : fieldmapper.aou.descendantNodeList(contextOrg, true) 
-        }, 
-        {   flesh : 1,  
+            org : fieldmapper.aou.descendantNodeList(contextOrg, true) }, 
+        {   streaming : true,
+            limit: lfGrid.displayLimit,
+            offset: lfGrid.displayOffset,
+            flesh : 1,  
             flesh_fields : {acqf : fundFleshFields},
-            streaming : true,
             onresponse : function(r, obj) {
                 if(fund = openils.Util.readResponse(r)) {
                     fundFleshFields.forEach(function(ff) {