[open-ils-commits] r16657 - branches/rel_1_6_0/Open-ILS/web/reports (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2010-06-10 14:49:14 -0400 (Thu, 10 Jun 2010)
New Revision: 16657

Modified:
   branches/rel_1_6_0/Open-ILS/web/reports/oils_rpt_utils.js
Log:
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

Modified: branches/rel_1_6_0/Open-ILS/web/reports/oils_rpt_utils.js
===================================================================
--- branches/rel_1_6_0/Open-ILS/web/reports/oils_rpt_utils.js	2010-06-10 18:48:37 UTC (rev 16656)
+++ branches/rel_1_6_0/Open-ILS/web/reports/oils_rpt_utils.js	2010-06-10 18:49:14 UTC (rev 16657)
@@ -93,11 +93,13 @@
 	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;
 		}
 	}