added grid fleshing get functions for PO search interface

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

diff --git a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/po.py b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/po.py
index e64c272..ed98f6e 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/po.py
+++ b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/po.py
@@ -106,3 +106,8 @@ class PoController(BaseController):
                                      'open-ils.acq.purchase_order.delete',
                                      r.ctx.core.authtoken.value, kwargs['id'])
         return r.render('acq/po/list')
+
+    def search(self):
+        r = RequestMgr()
+        return r.render('acq/po/search.html')
+

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/search.js b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/search.js
index 7004cfd..71c8197 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/search.js
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/search.js
@@ -4,6 +4,25 @@ dojo.require('dijit.form.FilteringSelect');
 dojo.require('dijit.form.NumberTextBox');
 dojo.require('dojox.grid.Grid');
 dojo.require('openils.acq.Provider');
+dojo.require('fieldmapper.OrgUtils');
+
+function getOrgInfo(rowIndex) {
+    data = poGrid.model.getRow(rowIndex);
+    if(!data) return;
+    return fieldmapper.aou.findOrgUnit(data.owner).shortname();
+}
+
+function getProvider(rowIndex) {
+    data = poGrid.model.getRow(rowIndex);
+    if(!data) return;
+    return openils.acq.Provider.retrieve(data.provider).name();
+}
+
+function getOwner(rowIndex) {
+    data = poGrid.model.getRow(rowIndex);
+    if(!data) return;
+    return new openils.User({id:data.owner}).user.usrname();
+}
 
 function doSearch(fields) {
     var itemList = [];

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html
index 95abb9e..8f689f1 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html
@@ -32,11 +32,11 @@
     var poGridStructure = [{
         cells : [[
             {name: '${_("ID")}', field: 'id'},
-            {name: '${_("Owner")}', field:'owner'},
-            {name: '${_("Ordering Agency")}', field: "ordering_agency"}, 
+            {name: '${_("Owner")}', get:getOwner},
+            {name: '${_("Ordering Agency")}', get:getOrgInfo},
             {name: '${_("Create Time")}', field:'create_time'},
             {name: '${_("Edit Time")}', field: "edit_time"},
-            {name: '${_("Provider")}', field:'provider'},
+            {name: '${_("Provider")}', get:getProvider},
             {name: '${_("State")}', field:'state'}
         ]]
     }];