updated report param editor to handle join types embedded in the field name. this...

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

diff --git a/Open-ILS/web/reports/oils_rpt_utils.js b/Open-ILS/web/reports/oils_rpt_utils.js
index 8648b73..2ab687e 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_utils.js
+++ b/Open-ILS/web/reports/oils_rpt_utils.js
@@ -93,11 +93,13 @@ function oilsRptMakeLabel(path) {
        var parts = path.split(/-/);
        var str = '';
        for( var i = 0; i < parts.length; i++ ) {
-               if(i%2 == 0) {
+               if(i%2 == 0) { // IDL class names
                        if( i == 0 )
                                str += oilsIDL[parts[i]].label;
-               } else {
-                       var f = oilsRptFindField(oilsIDL[parts[i-1]], parts[i]);
+               } else { // Field names
+            var name = parts[i];
+            name = name.replace(/>.*/,''); // field name may be appended with >join-type
+            var f = oilsRptFindField(oilsIDL[parts[i-1]], name);
                        str += " -> "+f.label;
                }
        }