Merge pull request mysticfall#206 from mzko/master

Pentaho CDE Widget improvement

Author: mysticfall

pivot4j-analytics/src/main/webapp/resources/pivot4j/css/style.css

@@ -717,4 +717,8 @@ body.ie-compat .ui-toolbar .ui-separator {
 
 .migration-dialog .ui-layout-container .ui-layout-pane-north {
 	border: none;
+}
+
+.wrap {
+	white-space: normal !important;
 }

pivot4j-pentaho/src/main/webapp/cde/component.xml

@@ -16,6 +16,7 @@
 			<Property>width</Property>
 			<Property>height</Property>
 			<Property>filePath</Property>
+			<Property name="parameters">xActionArrayParameter</Property>
 			<Property>listeners</Property>
 			<Property>preExecution</Property>
 			<Property>postExecution</Property>

pivot4j-pentaho/src/main/webapp/cde/pivot4j-widget.js

@@ -1,27 +1,48 @@
 var Pivot4JComponent = BaseComponent.extend({
 
 	update : function() {
-		if (!this.htmlObject) {
+		myself = this;
+		if (!myself.htmlObject) {
 			return;
 		}
 
-		var widget = $("#" + this.htmlObject);
-		var iframe = $(document.createElement("iframe"));
+		var widget = $("#" + myself.htmlObject);
+		var iframe = $("#id_" + myself.htmlObject + "_iframe");
+		if (iframe.length != 0) {
+			iframe.remove();
+		}
+
+		iframe = $(document.createElement("iframe"));
+		iframe.attr("id", "id_" + myself.htmlObject + "_iframe");
+		if (myself.width) {
+			iframe.width(myself.width);
+		}
 
-		if (this.width) {
-			iframe.width(this.width);
+		if (myself.width) {
+			iframe.height(myself.height);
 		}
 
-		if (this.width) {
-			iframe.height(this.height);
+		var query = "";
+		if (myself.parameters) {
+			var p = new Array(myself.parameters?myself.parameters.length:0);
+			for(var i= 0, len = p.length; i < len; i++) {
+				var key = myself.parameters[i][0];
+				var value = myself.parameters[i][1] == "" || myself.parameters[i][1] == "NIL" ? myself.parameters[i][2] : myself.parameters[i][1];
+				if (window.hasOwnProperty(value)) {
+					value = window[value];
+				} else {
+					value = Dashboards.getParameterValue(value);
+				}
+				query = query + "&" + encodeURIComponent(key) + "=" + encodeURIComponent(value);
+			}
 		}
 
-		var path = encodeURIComponent(this.filePath);
+		var path = encodeURIComponent(myself.filePath);
 
 		iframe.attr("frameBorder", "none").attr(
 				"src",
 				webAppPath + "/plugin/pivot4j/faces/open.xhtml?embeded=true&path="
-						+ path);
+						+ path + query);
 
 		widget.append(iframe);
 	}