From 980ea22038d9e3a01b36d988e705b188d480d33d Mon Sep 17 00:00:00 2001 From: Tihomir Surdilovic Date: Wed, 29 Apr 2015 13:09:17 -0400 Subject: [PATCH] BZ 1216108 - 'Content' assignment is not preserved in REST Task --- .../bpmn2/impl/Bpmn2JsonMarshaller.java | 49 ++++++++++++------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/jbpm-designer-backend/src/main/java/org/jbpm/designer/bpmn2/impl/Bpmn2JsonMarshaller.java b/jbpm-designer-backend/src/main/java/org/jbpm/designer/bpmn2/impl/Bpmn2JsonMarshaller.java index 97c129f29e..d230856360 100644 --- a/jbpm-designer-backend/src/main/java/org/jbpm/designer/bpmn2/impl/Bpmn2JsonMarshaller.java +++ b/jbpm-designer-backend/src/main/java/org/jbpm/designer/bpmn2/impl/Bpmn2JsonMarshaller.java @@ -1799,27 +1799,38 @@ protected void marshallTask(Task task, BPMNPlane plane, JsonGenerator generator, associationValue = ""; } - // don't include properties that have their independent input editors: - if(!(rhsAssociation.equals("GroupId") || - rhsAssociation.equals("Skippable") || - rhsAssociation.equals("Comment") || - rhsAssociation.equals("Priority") || - rhsAssociation.equals("Content") || - rhsAssociation.equals("TaskName") || - rhsAssociation.equals("Locale") || - rhsAssociation.equals("CreatedBy") || - rhsAssociation.equals("NotCompletedReassign") || - rhsAssociation.equals("NotStartedReassign") || - rhsAssociation.equals("NotCompletedNotify") || - rhsAssociation.equals("NotStartedNotify") - )) { - String replacer = associationValue.replaceAll(",", "##"); - associationBuff.append("[din]" + rhsAssociation).append("=").append(replacer); - associationBuff.append(","); - - properties.put(rhsAssociation.toLowerCase(), associationValue); + // don't include properties that have their independent input editors + if(isCustomElement((String) properties.get("taskname"), preProcessingData)) { + if(!(rhsAssociation.equals("TaskName"))) { + String replacer = associationValue.replaceAll(",", "##"); + associationBuff.append("[din]" + rhsAssociation).append("=").append(replacer); + associationBuff.append(","); + + properties.put(rhsAssociation.toLowerCase(), associationValue); + } + } else { + if(!(rhsAssociation.equals("GroupId") || + rhsAssociation.equals("Skippable") || + rhsAssociation.equals("Comment") || + rhsAssociation.equals("Priority") || + rhsAssociation.equals("Content") || + rhsAssociation.equals("TaskName") || + rhsAssociation.equals("Locale") || + rhsAssociation.equals("CreatedBy") || + rhsAssociation.equals("NotCompletedReassign") || + rhsAssociation.equals("NotStartedReassign") || + rhsAssociation.equals("NotCompletedNotify") || + rhsAssociation.equals("NotStartedNotify") + )) { + String replacer = associationValue.replaceAll(",", "##"); + associationBuff.append("[din]" + rhsAssociation).append("=").append(replacer); + associationBuff.append(","); + + properties.put(rhsAssociation.toLowerCase(), associationValue); + } } + if(rhsAssociation.equalsIgnoreCase("TaskName")) { properties.put("taskname", associationValue); }