Pretty display of Library names now works. Also speed up display

of line items by not talking to the server if the fund or org
unit fields are null.

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@9488 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 9baeced..a6c6cb6 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
@@ -14,6 +14,8 @@
        dojo.require('openils.acq.Picklist');
        // For decoding fund IDs into names
        dojo.require("openils.acq.Fund");
+       // For decoding Library IDs into names
+       dojo.require("fieldmapper.OrgUtils");
     </script>
     <script type='text/javascript'>
        function getJUBTitle(rowIndex) {
@@ -28,13 +30,22 @@
        }
        function getLIDFundName(rowIndex) {
            var data = lineItemGrid.model.getRow(rowIndex);
-           if (!data) return;
+           if (!data || !data.fund) return;
            try {
                return openils.acq.Fund.retrieve(data.fund).name();
            } catch (evt) {
                return data.fund;
            }
        }
+       function getLIDLibName(rowIndex) {
+           var data = lineItemGrid.model.getRow(rowIndex);
+           if (!data || !data.owning_lib) return;
+           try {
+               return fieldmapper.aou.findOrgUnit(data.owning_lib, true).name();
+           } catch (evt) {
+               return data.owning_lib;
+           }
+       }
     </script>
 </%def>
 <%def name="page_title()">${_('Picklist')}</%def>
@@ -70,7 +81,7 @@
                var lineitemLayout = [{ cells: [[
                    {name:"ID", field:"id"},
                    {name:"Fund", get:getLIDFundName},
-                   {name:"Location", field:"location"} ]] }];
+                   {name:"Location", get:getLIDLibName} ]] }];
 
                openils.acq.Picklist.createStore(${c.oils.acq.picklist.value.id()},
                    function(storeData) {