plugged org labels to grid

git-svn-id: svn://svn.open-ils.org/ILS/trunk@11342 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/js/ui/default/conify/global/permission/grp_penalty_threshold.js b/Open-ILS/web/js/ui/default/conify/global/permission/grp_penalty_threshold.js
index b26ba8e..8755533 100644 (file)
--- a/Open-ILS/web/js/ui/default/conify/global/permission/grp_penalty_threshold.js
+++ b/Open-ILS/web/js/ui/default/conify/global/permission/grp_penalty_threshold.js
@@ -5,6 +5,7 @@ dojo.require('dijit.form.FilteringSelect');
 dojo.require('openils.PermGrp');
 dojo.require('openils.widget.OrgUnitFilteringSelect');
 dojo.require('openils.widget.PermGrpFilteringSelect');
+dojo.require('fieldmapper.OrgUtils');
 
 var GPT = {
 
@@ -91,6 +92,13 @@ var GPT = {
                 oncomplete: GPT._loadCspComplete
             }
         );
+    }, 
+
+    getOrgInfo : function(rowIndex, item) {
+        if(item) {
+            var orgId = this.grid.store.getValue(item, this.field);
+            return fieldmapper.aou.findOrgUnit(orgId).shortname();
+        }
     }
 };
 

diff --git a/Open-ILS/web/templates/default/conify/global/permission/grp_penalty_threshold.tt2 b/Open-ILS/web/templates/default/conify/global/permission/grp_penalty_threshold.tt2
index beb33cd..3aa5e51 100644 (file)
--- a/Open-ILS/web/templates/default/conify/global/permission/grp_penalty_threshold.tt2
+++ b/Open-ILS/web/templates/default/conify/global/permission/grp_penalty_threshold.tt2
@@ -52,7 +52,7 @@
                 <tr>
                     <th field="id">ID</th>
                     <th field="grp" width='auto' get='GPT.getGroupName'>Group</th>
-                    <th field="org_unit" width='auto'>Context Org Unit</th>
+                    <th field="org_unit" width='auto' get='GPT.getOrgInfo'>Context Org Unit</th>
                     <th field="penalty" width='auto'>Penalty</th>
                     <th field="threshold" width='auto'>threshold</th>
                 </tr>