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:47 UTC
[syncope] branch 2_1_X updated (5301ca2 -> d146706)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from 5301ca2 [SYNCOPE-1594] Adding Batch delete support to User Requests
new b882434 Cleanup
new d146706 Include dynamic Roles when fetching AnyLayout info
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/syncope/client/console/layout/AnyLayoutUtils.java | 6 +++++-
.../java/org/apache/syncope/client/console/panels/AnyPanel.java | 3 ---
.../apache/syncope/client/console/rest/UserRequestRestClient.java | 3 ---
3 files changed, 5 insertions(+), 7 deletions(-)
[syncope] 01/02: Cleanup
Posted by il...@apache.org.
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 b882434479de5c42c10114d9e8d9ef11de6f7c34
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed Oct 21 13:34:05 2020 +0200
Cleanup
---
.../org/apache/syncope/client/console/rest/UserRequestRestClient.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/rest/UserRequestRestClient.java b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/rest/UserRequestRestClient.java
index 335d536..834f212 100644
--- a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/rest/UserRequestRestClient.java
+++ b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/rest/UserRequestRestClient.java
@@ -18,9 +18,6 @@
*/
package org.apache.syncope.client.console.rest;
-import static org.apache.syncope.client.console.rest.BaseRestClient.LOG;
-import static org.apache.syncope.client.console.rest.BaseRestClient.getStatus;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
[syncope] 02/02: Include dynamic Roles when fetching AnyLayout info
Posted by il...@apache.org.
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