BZ 1049444 - IE: Wrong Process name if you create second process

WillieMatthewLiu · Apr 10, 2014 · 400a570 · 400a570
1 parent c7a60dd
commit 400a570
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...backend/src/main/java/org/jbpm/designer/web/preprocessing/impl/JbpmPreprocessingUnit.java b/...backend/src/main/java/org/jbpm/designer/web/preprocessing/impl/JbpmPreprocessingUnit.java
@@ -245,7 +245,7 @@ public void preprocess(HttpServletRequest req, HttpServletResponse res, IDiagram
             workItemTemplate.add("packageName", "org.jbpm");
 
             String processName = asset.getName();
-            workItemTemplate.add("processn", processName);
+            workItemTemplate.add("processn", "");
 
             String packageNameStr = (processPackage.length() > 0) ? processPackage + "." : "";
             if(packageNameStr.length() > 0) {

diff --git a/jbpm-designer-client/src/main/resources/org/jbpm/designer/public/editor.st b/jbpm-designer-client/src/main/resources/org/jbpm/designer/public/editor.st
@@ -31,7 +31,7 @@
         ORYX.CONFIG.STORESVGONSAVE = "$storesvgonsave$";
         ORYX.PRESET_PERSPECTIVE = "$presetperspective$";
 
-        ORYX.DEFAULT_JSON_MODEL = {"resourceId":"Definition","properties":{"namespaces":"","name":"","expressionlanguage":"http://www.mvel.org/2.0","executable":"true","package":"org.jbpm","vardefs":"","adhocprocess":"false","imports":"","globals":"","id":"defaultprocess","version":"1.0","timeunit":"min","currency":"","targetnamespace":"http://www.omg.org/bpmn20","typelanguage":"http://www.java.com/javaTypes","processn":"","documentation":""},"stencil":{"id":"BPMNDiagram"},"childShapes":[],"bounds":{"lowerRight":{"x":3000,"y":2000},"upperLeft":{"x":0,"y":0}},"stencilset":{"url":"/org.jbpm.designer.jBPMDesigner/stencilsets/bpmn2.0jbpm/bpmn2.0jbpm.json","namespace":"http://b3mn.org/stencilset/bpmn2.0#"},"ssextensions":[]};
+        ORYX.DEFAULT_JSON_MODEL = {"resourceId":"Definition","properties":{"namespaces":"","name":"","expressionlanguage":"http://www.mvel.org/2.0","executable":"true","package":"org.jbpm","vardefs":"","adhocprocess":"false","imports":"","globals":"","id":"defaultprocess","version":"1.0","timeunit":"min","currency":"","targetnamespace":"http://www.omg.org/bpmn20","typelanguage":"http://www.java.com/javaTypes","processn":"","documentation":""},"stencil":{"id":"BPMNDiagram"},"childShapes":[],"bounds":{"lowerRight":{"x":3000,"y":2000},"upperLeft":{"x":0,"y":0}},"stencilset":{"url":"/stencilsets/bpmn2.0jbpm/bpmn2.0jbpm.json","namespace":"http://b3mn.org/stencilset/bpmn2.0#"},"ssextensions":[]};
 
 
 
@@ -40,6 +40,7 @@
             // for each of the extensions, we get the extension file and return its contents.
             var contents = null;
             new Ajax.Request(ORYX.CONFIG.ROOT_PATH + "/stencilset/" + ssext, {
+                parameters: {ts:new Date().getTime()},
                 asynchronous:false,
                 method:'get',
                 contentType:'application/json',
@@ -54,6 +55,7 @@
         });
 
         new Ajax.Request(ORYX.CONFIG.ROOT_PATH + "/plugins", {
+            parameters: {timestamp:new Date().getTime()},
             asynchronous:false,
             method:'get',
             contentType:'application/json',