From 05004f4d6d4e777872da78fab4924fbb15794fdd Mon Sep 17 00:00:00 2001 From: erickson Date: Thu, 10 Jun 2010 18:47:57 +0000 Subject: [PATCH] updated report param editor to handle join types embedded in the field name. this bug caused sporadic failed rendering of the report editor params widgets git-svn-id: svn://svn.open-ils.org/ILS/trunk@16655 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/reports/oils_rpt_utils.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Open-ILS/web/reports/oils_rpt_utils.js b/Open-ILS/web/reports/oils_rpt_utils.js index 8648b73a9..2ab687eb6 100644 --- 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; } } -- 2.11.0