BZ 1123855 - Unable to assign variable name of the multi-instance sub…

… process
kiegroup · Aug 8, 2014 · ae32e2d · ae32e2d
1 parent 66880fa
commit ae32e2d
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 9 deletions.
diff --git a/...-designer-client/src/main/resources/org/jbpm/designer/public/js/Plugins/propertywindow.js b/...-designer-client/src/main/resources/org/jbpm/designer/public/js/Plugins/propertywindow.js
@@ -3037,9 +3037,52 @@ Ext.form.ComplexActionsField = Ext.extend(Ext.form.TriggerField,  {
         var dataOutputsOnlyVals = new Array();
 
         varDataTitle.push("");
-        varDataTitle.push("** Variable Definitions **");
-        varData.push(varDataTitle);
-        variableDefsOnly.push(varDataTitle);
+
+        // for MIsub children add MIsub vardefs
+        var addedTitle = false;
+        var selection = ORYX.EDITOR._pluginFacade.getSelection();
+        if(selection) {
+            var selected = selection.first();
+            if(selected && selected.parent) {
+                if(selected.parent._stencil._jsonStencil.id == "http://b3mn.org/stencilset/bpmn2.0#MultipleInstanceSubprocess") {
+
+                    varDataTitle.push("** Process/MI Subprocess Vars **");
+                    varData.push(varDataTitle);
+                    variableDefsOnly.push(varDataTitle);
+                    addedTitle = true;
+
+                    var vardefsprop = selected.parent.properties["oryx-vardefs"];
+                    if(vardefsprop && vardefsprop.length > 0) {
+                        var vardefspropParts = vardefsprop.split(",");
+                        for(var k=0; k < vardefspropParts.length; k++) {
+                            var nextPart = vardefspropParts[k];
+                            var innerVal = new Array();
+                            if(nextPart.indexOf(":") > 0) {
+                                var innerParts = nextPart.split(":");
+                                innerVal.push(innerParts[0]);
+                                innerVal.push(innerParts[0]);
+                                dataTypeMap[innerParts[0]] = innerParts[1];
+                                variableDefsOnlyVals.push(innerParts[0]);
+                            } else {
+                                innerVal.push(nextPart);
+                                innerVal.push(nextPart);
+                                dataTypeMap[nextPart] = "java.lang.String";
+                                variableDefsOnlyVals.push(nextPart);
+                            }
+                            varData.push(innerVal);
+                            variableDefsOnly.push(innerVal);
+                        }
+                    }
+                }
+            }
+        }
+
+        if(!addedTitle) {
+            varDataTitle.push("** Variable Definitions **");
+            varData.push(varDataTitle);
+            variableDefsOnly.push(varDataTitle);
+        }
+
         if(processVars) {
         	processVars.forEach(function(item){
             	if(item.length > 0) {
@@ -3066,6 +3109,7 @@ Ext.form.ComplexActionsField = Ext.extend(Ext.form.TriggerField,  {
         	});
         }
 
+
         var dataInputsTitle = new Array();
         dataInputsTitle.push("");
         dataInputsTitle.push("** Data Inputs **");

diff --git a/...n/resources/org/jbpm/designer/public/stencilsets/bpmn2.0jbpm/stencildata/bpmn2.0jbpm.orig b/...n/resources/org/jbpm/designer/public/stencilsets/bpmn2.0jbpm/stencildata/bpmn2.0jbpm.orig
@@ -4151,25 +4151,39 @@
 						}
 					]
 				},
-				{
+		{
                     "id":"multipleinstancecollectioninput",
-                    "type":"String",
+                    "type":"Dynamicchoice",
                     "title":"MI collection input",
                     "value":"",
                     "description":"Sets the multiple instances collection input.",
                     "description_ja":"複数インスタンスコレクション入力を指定",
                     "readonly":false,
-                    "optional":false
+                    "optional":false,
+                    "items": [
+                        {
+                            "id": "c1",
+                            "title":"vardefs",
+                            "value":"\$.properties.vardefs"
+                        }
+                    ]
                 },
-                {
+		{
                     "id":"multipleinstancecollectionoutput",
-                    "type":"String",
+                    "type":"Dynamicchoice",
                     "title":"MI collection output",
                     "value":"",
                     "description":"Sets the multiple instances collection output.",
                     "description_ja":"複数インスタンスコレクション出力を指定",
                     "readonly":false,
-                    "optional":true
+                    "optional":false,
+                    "items": [
+                        {
+                            "id": "c1",
+                            "title":"vardefs",
+                            "value":"\$.properties.vardefs"
+                        }
+                    ]
                 },
                 {
                     "id":"multipleinstancedatainput",