diff options
Diffstat (limited to 'source/com/c2kernel/lifecycle/instance')
4 files changed, 8 insertions, 5 deletions
diff --git a/source/com/c2kernel/lifecycle/instance/Activity.java b/source/com/c2kernel/lifecycle/instance/Activity.java index 226f0af..8a07d15 100644 --- a/source/com/c2kernel/lifecycle/instance/Activity.java +++ b/source/com/c2kernel/lifecycle/instance/Activity.java @@ -600,7 +600,7 @@ public class Activity extends WfVertex event = auditEvent(transitionID, agent);
if (event != null)
eventID = event.getID();
- if (Boolean.TRUE.equals(getProperties().get("AlwaysUseOutcome")) || transitionID == Transitions.DONE || transitionID == Transitions.COMPLETE)
+ if (transitionID == Transitions.DONE || transitionID == Transitions.COMPLETE)
storeOutcome(eventID, requestData);
EntityPath entityPath = getItemEntityPath();
TransactionManager storage = Gateway.getStorage();
diff --git a/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java b/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java index 0b6c9e4..39e7ee9 100644 --- a/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java +++ b/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java @@ -36,7 +36,7 @@ public class WfVertexFactory implements VertexFactory, WorkflowDialogue new ActivityChooser(
Language.translate("Please enter a Type for the new activity"),
Language.translate("New " + vertexTypeId + " Activity"),
- Resource.getImageResource("graph/newvertex_large.png").getImage(),
+ Resource.findImage("graph/newvertex_large.png").getImage(),
this,
mhm);
a.setVisible(true);
@@ -69,7 +69,7 @@ public class WfVertexFactory implements VertexFactory, WorkflowDialogue Language.translate("Activity name not unique. Please give another."),
Language.translate("New " + vertexTypeId + " Activity"),
JOptionPane.QUESTION_MESSAGE,
- Resource.getImageResource("graph/newvertex_large.png"),
+ Resource.findImage("graph/newvertex_large.png"),
null,
null);
if (newName.equals(""))
diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java index 96371dd..aa30677 100644 --- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java +++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java @@ -33,15 +33,17 @@ public class CreateNewAgent extends PredefinedStep InvalidDataException
{
checkAccessRights(agent);
-
+ String redactedRequestData;
try {
NewAgent newAgent = (NewAgent)CastorXMLUtility.unmarshall(requestData);
newAgent.create(agent.getSysKey());
+ newAgent.password = "REDACTED";
+ redactedRequestData = CastorXMLUtility.marshall(newAgent);
} catch (Exception ex) {
Logger.error(ex);
throw new InvalidDataException("Error creating agent", "");
}
- sendEventStoreOutcome(transitionID, requestData, agent);
+ sendEventStoreOutcome(transitionID, redactedRequestData, agent);
}
}
diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java index 5666a00..f155ced 100644 --- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java +++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java @@ -24,6 +24,7 @@ import com.c2kernel.utils.Logger; *
* @version $Revision: 1.8 $ $Date: 2006/03/03 13:52:21 $
*/
+
public class NewItem {
public String name;
|