From d40d30d0cd84d4756809431eb777fccb8c749b43 Mon Sep 17 00:00:00 2001
From: leo-ccin2p3 <lionel.schwarz@in2p3.fr>
Date: Fri, 17 Jan 2025 09:20:46 +0100
Subject: [PATCH] [SYNCOPE-1854] Propagate changes for user update while
 pending approval

---
 .../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 8989ce0b3af..cf2074f8dc8 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
@@ -325,6 +325,11 @@ protected UserWorkflowResult<Pair<UserUR, Boolean>> doUpdate(
                 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);