Merge branch 'master' of https://github.com/SpagoBILabs/SpagoBI

SpagoBILabs · Oct 5, 2016 · 83f2f32 · 83f2f32
2 parents 6e19f38 + d2f16a0
commit 83f2f32
Showing 1 changed file with 26 additions and 0 deletions.
diff --git a/SpagoBIProject/src/main/webapp/js/src/ext/sbi/execution/DocumentPage.js b/SpagoBIProject/src/main/webapp/js/src/ext/sbi/execution/DocumentPage.js
@@ -659,6 +659,32 @@ Ext.extend(Sbi.execution.DocumentPage, Ext.Panel, {
 			if(executionInstance.PARAMETERS){
 				try {
 					var parameters =  JSON.parse(executionInstance.PARAMETERS); // Produces a SyntaxError
+					//decode parameters for multivalue case ( from {;{xx;yy}STRING} syntax to ["xx","yy"])
+					var refreshParamsContent = false;
+					for (p in parameters){
+						if (Array.isArray(parameters[p])){
+							var pp = parameters[p];
+							if (typeof pp !== "function"){
+								for (var v=0; v<pp.length; v++){
+									var arrValues = [];
+									if (typeof pp[v] !== "function"){
+										if (pp[v].indexOf("{") == 0){
+											var tmpVal = pp[v];
+											var tmpTypePar = tmpVal.substring(tmpVal.indexOf("}")+1 , tmpVal.length-1 );
+											var tmpValues = tmpVal.substring(tmpVal.indexOf("{;{")+3, tmpVal.indexOf("}"));
+											arrValues = tmpValues.split(";");
+											parameters[p] = arrValues;
+											refreshParamsContent = true;
+										}
+									}
+								}
+							}
+						} 
+					}
+					if (refreshParamsContent){
+						this.executionInstance.PARAMETERS = JSON.stringify(parameters);
+					}
+
 					if(parameters.outputType){
 						outputType = parameters.outputType;
 						if(outputType != null){