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 2017/09/08 13:42:07 UTC
[5/6] syncope git commit: White noise: ignore
White noise: ignore
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/19a0345f
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/19a0345f
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/19a0345f
Branch: refs/heads/master
Commit: 19a0345f6d587e9f85f0106b4b28b95696a943d9
Parents: cf2c965
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Sep 8 10:43:29 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Sep 8 13:14:19 2017 +0200
----------------------------------------------------------------------
.../syncope/client/console/approvals/ApprovalDirectoryPanel.java | 3 ++-
.../test/java/org/apache/syncope/fit/core/UserWorkflowITCase.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/19a0345f/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 d373588..5ace09c 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
@@ -323,6 +323,7 @@ public class ApprovalDirectoryPanel
final List<String> anyTypeClasses,
final UserFormLayoutInfo formLayoutInfo,
final PageReference pageRef) {
+
super(previousUserTO, userTO, anyTypeClasses, formLayoutInfo, pageRef);
this.formTO = formTO;
this.target = target;
@@ -341,7 +342,6 @@ public class ApprovalDirectoryPanel
claimForm(restClient.getFormForUser(actual.getEntity().getKey()).getTaskId());
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
} else {
-
UserPatch patch = AnyOperations.diff(inner, formTO.getUserTO(), false);
if (StringUtils.isNotBlank(inner.getPassword())) {
@@ -362,6 +362,7 @@ public class ApprovalDirectoryPanel
}
}
+
return actual;
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/19a0345f/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserWorkflowITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserWorkflowITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserWorkflowITCase.java
index cc5e3c8..5670398 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserWorkflowITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserWorkflowITCase.java
@@ -154,7 +154,7 @@ public class UserWorkflowITCase extends AbstractITCase {
userTO.getMemberships().add(
new MembershipTO.Builder().group("0cbcabd2-4410-4b6b-8f05-a052b451d18f").build());
- // 1. create user with group 9 (and verify that no propagation occurred)
+ // 1. create user and verify that no propagation occurred)
ProvisioningResult<UserTO> result = createUser(userTO);
assertNotNull(result);
userTO = result.getEntity();