syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdisabat...@apache.org
Subject syncope git commit: [SYNCOPE-1248] Fix update user during approval process
Date Tue, 12 Dec 2017 00:22:13 GMT
Repository: syncope
Updated Branches:
  refs/heads/2_0_X a28d85dba -> 227642a63


[SYNCOPE-1248] Fix update user during approval process


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/227642a6
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/227642a6
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/227642a6

Branch: refs/heads/2_0_X
Commit: 227642a632a4f1c75d1bb88d18a22d025c094694
Parents: a28d85d
Author: Marco Di Sabatino Di Diodoro <marco.disabatino@tirasa.net>
Authored: Tue Dec 12 01:19:51 2017 +0100
Committer: Marco Di Sabatino Di Diodoro <marco.disabatino@tirasa.net>
Committed: Tue Dec 12 01:20:11 2017 +0100

----------------------------------------------------------------------
 .../client/console/approvals/ApprovalDirectoryPanel.java        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/227642a6/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java
index 80e216d..f43bcaf 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java
@@ -211,9 +211,10 @@ public class ApprovalDirectoryPanel
                     previousUserTO.setKey(formTO.getUserPatch().getKey());
                     newUserTO = AnyOperations.patch(previousUserTO, formTO.getUserPatch());
                 } else {
-                    formTO.getUserTO().setKey(formTO.getUserPatch().getKey());
-                    newUserTO = AnyOperations.patch(formTO.getUserTO(), formTO.getUserPatch());
                     previousUserTO = formTO.getUserTO();
+                    formTO.getUserTO().setKey(formTO.getUserPatch().getKey());
+                    formTO.getUserTO().setPassword(null);
+                    newUserTO = AnyOperations.patch(formTO.getUserTO(), formTO.getUserPatch());

                 }
 
                 AjaxWizard.EditItemActionEvent<UserTO> editItemActionEvent =


Mime
View raw message