syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [1/2] syncope git commit: [SYNCOPE-1319] Role assignment from template was missing
Date Tue, 29 May 2018 12:49:07 GMT
Repository: syncope
Updated Branches:
  refs/heads/2_0_X dfd1ec8a3 -> 2fa40d252
  refs/heads/master 3ee0535c5 -> 37bea639c


[SYNCOPE-1319] Role assignment from template was missing


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

Branch: refs/heads/2_0_X
Commit: 2fa40d2529eb37f2e80b0317dd960fd48a9da862
Parents: dfd1ec8
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Tue May 29 14:48:28 2018 +0200
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Tue May 29 14:48:28 2018 +0200

----------------------------------------------------------------------
 .../apache/syncope/core/provisioning/java/utils/TemplateUtils.java  | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/2fa40d25/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/TemplateUtils.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/TemplateUtils.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/TemplateUtils.java
index 5df7cce..aab33c7 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/TemplateUtils.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/TemplateUtils.java
@@ -174,6 +174,7 @@ public class TemplateUtils {
 
             fillRelationships((GroupableRelatableTO) anyTO, ((GroupableRelatableTO) template));
             fillMemberships((GroupableRelatableTO) anyTO, ((GroupableRelatableTO) template));
+            ((UserTO) anyTO).getRoles().addAll(((UserTO) template).getRoles());
         } else if (template instanceof GroupTO) {
             if (StringUtils.isNotBlank(((GroupTO) template).getName())) {
                 String evaluated = JexlUtils.evaluate(((GroupTO) template).getName(), jexlContext);


Mime
View raw message