Pretty display of fund names instead of fund IDs

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

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html
index f755fa2..9baeced 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html
@@ -12,18 +12,29 @@
     <script type="text/javascript">
         dojo.require("dijit.layout.SplitContainer")
        dojo.require('openils.acq.Picklist');
+       // For decoding fund IDs into names
+       dojo.require("openils.acq.Fund");
     </script>
     <script type='text/javascript'>
        function getJUBTitle(rowIndex) {
-           data = pickListGrid.model.getRow(rowIndex);
+           var data = pickListGrid.model.getRow(rowIndex);
            if (!data) return '';
            return openils.acq.Picklist.find_attr(data.id, "title", "lineitem_marc_attr_definition")
        }
        function getJUBPrice(rowIndex) {
-           data = pickListGrid.model.getRow(rowIndex);
+           var data = pickListGrid.model.getRow(rowIndex);
            if (!data) return;
            return openils.acq.Picklist.find_attr(data.id, "price", "lineitem_marc_attr_definition")
        }
+       function getLIDFundName(rowIndex) {
+           var data = lineItemGrid.model.getRow(rowIndex);
+           if (!data) return;
+           try {
+               return openils.acq.Fund.retrieve(data.fund).name();
+           } catch (evt) {
+               return data.fund;
+           }
+       }
     </script>
 </%def>
 <%def name="page_title()">${_('Picklist')}</%def>
@@ -57,9 +68,9 @@
                }];
 
                var lineitemLayout = [{ cells: [[
-                   {name:'ID', field:'id'},
-                   {name:'Fund', field:'fund'},
-                   {name:'Location', field:'location'} ]] }];
+                   {name:"ID", field:"id"},
+                   {name:"Fund", get:getLIDFundName},
+                   {name:"Location", field:"location"} ]] }];
 
                openils.acq.Picklist.createStore(${c.oils.acq.picklist.value.id()},
                    function(storeData) {