[open-ils-commits] r13143 - trunk/Open-ILS/xul/staff_client/server/admin (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2009-05-12 10:28:10 -0400 (Tue, 12 May 2009)
New Revision: 13143

Modified:
   trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js
   trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
Log:
apply a formatter so dojo-1.3 will render the html links

Modified: trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js	2009-05-12 13:54:59 UTC (rev 13142)
+++ trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js	2009-05-12 14:28:10 UTC (rev 13143)
@@ -155,9 +155,13 @@
 function osGetEditLink(rowIdx) {
     var data = this.grid.model.getRow(rowIdx);
     if(!data) return '';
-    return this.value.replace(/SETTING/, data.name);
+    return data.name;
 }
 
+function osFormatEditLink(name) {
+    return this.value.replace(/SETTING/, name);
+}
+
 function osLaunchEditor(name) {
     osEditDialog._osattr = name;
     osEditDialog.show();

Modified: trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml	2009-05-12 13:54:59 UTC (rev 13142)
+++ trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml	2009-05-12 14:28:10 UTC (rev 13143)
@@ -200,8 +200,11 @@
                     var osGridLayout = [{
                         defaultCell: {styles: 'text-align: center;'},
                         cells : [[
-                            {name: 'Edit', get: osGetEditLink, 
-                                value: '<a href="javascript:void(0);" onclick="osLaunchEditor(\'SETTING\');">Edit</a>'},
+                            {   name: 'Edit', 
+                                value: '<a href="javascript:void(0);" onclick="osLaunchEditor(\'SETTING\');">Edit</a>',
+                                get: osGetEditLink, 
+                                formatter : osFormatEditLink
+                            },
                             {name: 'Setting', get: osGetGridData, field:'label', width:'auto', styles:'text-align:left;'},
                             {name: 'Context', get: osGetGridData, field:'context'},
                             {name: 'Value', get: osGetGridData, field:'value', width:'auto'},