You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2014/11/07 09:54:20 UTC
[1/3] syncope git commit: [SYNCOPE-602] Adding workflow variable for
form submitter
Repository: syncope
Updated Branches:
refs/heads/1_2_X 972f5dba1 -> da760280e
refs/heads/master d23a81ccd -> 0e5254d75
[SYNCOPE-602] Adding workflow variable for form submitter
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/da760280
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/da760280
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/da760280
Branch: refs/heads/1_2_X
Commit: da760280e76f71d415b40df6ce1e73ae4cf5a456
Parents: 972f5db
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Nov 7 09:53:56 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Nov 7 09:53:56 2014 +0100
----------------------------------------------------------------------
.../core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/da760280/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
index 4f0d876..2587706 100644
--- a/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
+++ b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
@@ -105,6 +105,8 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
public static final String WF_EXECUTOR = "wfExecutor";
+ public static final String FORM_SUBMITTER = "formSubmitter";
+
public static final String USER_TO = "userTO";
public static final String ENABLED = "enabled";
@@ -814,6 +816,8 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
Set<String> preTasks = getPerformedTasks(user);
try {
formService.submitTaskFormData(form.getTaskId(), form.getPropertiesForSubmit());
+ runtimeService.setVariable(
+ user.getWorkflowId(), FORM_SUBMITTER, EntitlementUtil.getAuthenticatedUsername());
} catch (ActivitiException e) {
throwException(e, "While submitting form for task " + form.getTaskId());
}
[2/3] syncope git commit: [SYNCOPE-602] Adding workflow variable for
form submitter
Posted by il...@apache.org.
[SYNCOPE-602] Adding workflow variable for form submitter
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/da760280
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/da760280
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/da760280
Branch: refs/heads/master
Commit: da760280e76f71d415b40df6ce1e73ae4cf5a456
Parents: 972f5db
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Nov 7 09:53:56 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Nov 7 09:53:56 2014 +0100
----------------------------------------------------------------------
.../core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/da760280/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
index 4f0d876..2587706 100644
--- a/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
+++ b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
@@ -105,6 +105,8 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
public static final String WF_EXECUTOR = "wfExecutor";
+ public static final String FORM_SUBMITTER = "formSubmitter";
+
public static final String USER_TO = "userTO";
public static final String ENABLED = "enabled";
@@ -814,6 +816,8 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
Set<String> preTasks = getPerformedTasks(user);
try {
formService.submitTaskFormData(form.getTaskId(), form.getPropertiesForSubmit());
+ runtimeService.setVariable(
+ user.getWorkflowId(), FORM_SUBMITTER, EntitlementUtil.getAuthenticatedUsername());
} catch (ActivitiException e) {
throwException(e, "While submitting form for task " + form.getTaskId());
}
[3/3] syncope git commit: Merge branch '1_2_X'
Posted by il...@apache.org.
Merge branch '1_2_X'
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0e5254d7
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0e5254d7
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0e5254d7
Branch: refs/heads/master
Commit: 0e5254d75c0600b390124f1f872c290aac021a47
Parents: d23a81c da76028
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Nov 7 09:54:04 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Nov 7 09:54:04 2014 +0100
----------------------------------------------------------------------
.../core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------