You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by an...@apache.org on 2017/06/28 09:22:30 UTC
syncope git commit: [SYNCOPE-1125] fixed password propagation on
resource after update on enduser
Repository: syncope
Updated Branches:
refs/heads/master 750247e6a -> 26fb9bdae
[SYNCOPE-1125] fixed password propagation on resource after update on enduser
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/26fb9bda
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/26fb9bda
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/26fb9bda
Branch: refs/heads/master
Commit: 26fb9bdae50088dc69338b300d045212fe1d7d98
Parents: 750247e
Author: Andrea Patricelli <an...@apache.org>
Authored: Wed Jun 28 11:21:39 2017 +0200
Committer: Andrea Patricelli <an...@apache.org>
Committed: Wed Jun 28 11:22:10 2017 +0200
----------------------------------------------------------------------
client/enduser/src/test/resources/customForm.json | 3 +++
.../main/java/org/apache/syncope/common/lib/AnyOperations.java | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/26fb9bda/client/enduser/src/test/resources/customForm.json
----------------------------------------------------------------------
diff --git a/client/enduser/src/test/resources/customForm.json b/client/enduser/src/test/resources/customForm.json
index 0a8b4d3..3866474 100644
--- a/client/enduser/src/test/resources/customForm.json
+++ b/client/enduser/src/test/resources/customForm.json
@@ -14,6 +14,9 @@
"fullname": {
"readonly": false
},
+ "userId": {
+ "readonly": false
+ },
"loginDate": {
"readonly": false
},
http://git-wip-us.apache.org/repos/asf/syncope/blob/26fb9bda/common/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java b/common/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java
index 0008842..55ff54a 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/AnyOperations.java
@@ -293,7 +293,9 @@ public final class AnyOperations {
if (updated.getPassword() != null
&& (original.getPassword() == null || !original.getPassword().equals(updated.getPassword()))) {
- result.setPassword(new PasswordPatch.Builder().value(updated.getPassword()).build());
+ result.setPassword(new PasswordPatch.Builder()
+ .value(updated.getPassword())
+ .resources(updated.getResources()).build());
}
// 2. username