(syncope) branch master updated: [SYNCOPE-1854] Propagate changes for user update while pending approval

[ilgrosso]

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/master by this push:
     new 16efca5d22 [SYNCOPE-1854] Propagate changes for user update while 
pending approval
16efca5d22 is described below

commit 16efca5d2252669080e17280508c386e2609fe84
Author: leo-ccin2p3 <lionel.schw...@in2p3.fr>
AuthorDate: Fri Jan 17 09:20:46 2025 +0100

    [SYNCOPE-1854] Propagate changes for user update while pending approval
---
 .../syncope/core/flowable/impl/FlowableUserWorkflowAdapter.java      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git 
a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserWorkflowAdapter.java
 
b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserWorkflowAdapter.java
index cef0968104..fc06046887 100644
--- 
a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserWorkflowAdapter.java
+++ 
b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableUserWorkflowAdapter.java
@@ -324,6 +324,11 @@ public class FlowableUserWorkflowAdapter extends 
AbstractUserWorkflowAdapter imp
                 Optional.ofNullable(propByResBeforeUpdate).orElse(propByRes),
                 
Optional.ofNullable(propByLinkedAccountBeforeUpdate).orElse(propByLinkedAccount));
 
+        if (inFormTask) {
+            propByRes = engine.getRuntimeService().getVariable(
+                    procInstID, FlowableRuntimeUtils.PROP_BY_RESOURCE, 
PropagationByResource.class);
+        }        
+
         Boolean propagateEnable = engine.getRuntimeService().getVariable(
                 procInstID, FlowableRuntimeUtils.PROPAGATE_ENABLE, 
Boolean.class);
         engine.getRuntimeService().removeVariable(procInstID, 
FlowableRuntimeUtils.PROPAGATE_ENABLE);