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 2020/10/22 07:43:49 UTC
[syncope] 02/02: Include dynamic Roles when fetching AnyLayout info
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit d146706121e6fb8d05e8fff09b9ef6e676f5e178
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu Oct 22 09:33:28 2020 +0200
Include dynamic Roles when fetching AnyLayout info
---
.../org/apache/syncope/client/console/layout/AnyLayoutUtils.java | 6 +++++-
.../java/org/apache/syncope/client/console/panels/AnyPanel.java | 3 ---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/layout/AnyLayoutUtils.java b/client/console/src/main/java/org/apache/syncope/client/console/layout/AnyLayoutUtils.java
index 523a4ab..37c97fc 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/layout/AnyLayoutUtils.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/layout/AnyLayoutUtils.java
@@ -24,6 +24,7 @@ import java.lang.reflect.InvocationTargetException;
import java.util.List;
import java.util.function.Function;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.panels.AnyPanel;
@@ -71,7 +72,10 @@ public final class AnyLayoutUtils {
}
public static AnyLayout fetch(final List<String> anyTypes) {
- List<String> ownedRoles = SyncopeConsoleSession.get().getSelfTO().getRoles();
+ List<String> ownedRoles = Stream.concat(
+ SyncopeConsoleSession.get().getSelfTO().getRoles().stream(),
+ SyncopeConsoleSession.get().getSelfTO().getDynRoles().stream()).
+ distinct().collect(Collectors.toList());
try {
AnyLayout anyLayout = null;
for (int i = 0; i < ownedRoles.size() && anyLayout == null; i++) {
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
index 8e80270..ead2159 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
@@ -170,8 +170,6 @@ public class AnyPanel extends Panel implements ModalPanel {
protected final RealmTO realmTO;
- protected final AnyLayout anyLayout;
-
protected final PageReference pageRef;
protected AbstractSearchPanel searchPanel;
@@ -201,7 +199,6 @@ public class AnyPanel extends Panel implements ModalPanel {
super(id);
this.anyTypeTO = anyTypeTO;
this.realmTO = realmTO;
- this.anyLayout = anyLayout;
this.pageRef = pageRef;
// ------------------------
// Accordion