[open-ils-commits] r10356 - in branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb: public/oils/media/ui_js/oils/default/acq/financial templates/oils/default/acq/financial

svn at svn.open-ils.org svn at svn.open-ils.org
Wed Aug 13 13:52:09 EDT 2008


Author: erickson
Date: 2008-08-13 13:52:06 -0400 (Wed, 13 Aug 2008)
New Revision: 10356

Modified:
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_fund.js
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
Log:
show empty cell if xfer_dest is null (instead of default "?")

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_fund.js
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_fund.js	2008-08-13 17:47:29 UTC (rev 10355)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_fund.js	2008-08-13 17:52:06 UTC (rev 10356)
@@ -31,6 +31,11 @@
     return fieldmapper.aou.findOrgUnit(data.org).shortname();
 }
 
+function getXferDest(rowIndex) {
+    data = this.grid.model.getRow(rowIndex);
+    if(!(data && data.xfer_destination)) return '';
+    return data.xfer_destination;
+}
 
 function loadFundGrid() {
     var store = new dojo.data.ItemFileReadStore({data:acqf.toStoreData([fund])});

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html	2008-08-13 17:47:29 UTC (rev 10355)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html	2008-08-13 17:52:06 UTC (rev 10356)
@@ -138,7 +138,7 @@
                         {name: '${_("Amount")}', field: "amount"}, 
                         {name: '${_("Encumbrance")}', field: "encumbrance"}, 
                         {name: '${_("Debit Type")}', field: "debit_type"}, 
-                        {name: '${_("Transfer Destination")}', field: "xfer_destination"}, 
+                        {name: '${_("Transfer Destination")}', field: "xfer_destination", get:getXferDest}, 
                     ]]
                 }];
             </script>



More information about the open-ils-commits mailing list