You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by sk...@apache.org on 2019/03/04 10:49:17 UTC
[syncope] branch master updated: [SYNCOPE-1432] Topology now shows
new created connectors and resources with no need of refreshing page
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new d00eec5 [SYNCOPE-1432] Topology now shows new created connectors and resources with no need of refreshing page
d00eec5 is described below
commit d00eec5890038e9f766b8e9e03563cb57ff4779e
Author: skylark17 <ma...@tirasa.net>
AuthorDate: Mon Mar 4 11:21:48 2019 +0100
[SYNCOPE-1432] Topology now shows new created connectors and resources with no need of refreshing page
---
.../org/apache/syncope/client/console/SyncopeWebApplication.java | 4 ++--
.../org/apache/syncope/client/console/wizards/any/AbstractAttrs.java | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java
index 7bcedf9..fad0aa9 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java
@@ -57,8 +57,8 @@ import org.apache.wicket.authroles.authentication.AbstractAuthenticatedWebSessio
import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.protocol.http.CsrfPreventionRequestCycleListener;
import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.protocol.ws.WebSocketAwareCsrfPreventionRequestCycleListener;
import org.apache.wicket.protocol.ws.api.WebSocketResponse;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebResponse;
@@ -229,7 +229,7 @@ public class SyncopeWebApplication extends WicketBootSecuredWebApplication {
getMarkupSettings().setCompressWhitespace(true);
if (BooleanUtils.toBoolean(csrf)) {
- getRequestCycleListeners().add(new CsrfPreventionRequestCycleListener());
+ getRequestCycleListeners().add(new WebSocketAwareCsrfPreventionRequestCycleListener());
}
getRequestCycleListeners().add(new SyncopeConsoleRequestCycleListener());
getRequestCycleListeners().add(new IRequestCycleListener() {
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
index 0ecb7dd..bd783b8 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
@@ -26,6 +26,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.syncope.client.console.rest.AnyTypeClassRestClient;
import org.apache.syncope.client.console.rest.GroupRestClient;
@@ -172,8 +173,8 @@ public abstract class AbstractAttrs<S extends SchemaTO> extends WizardStep imple
@Override
public void renderHead(final IHeaderResponse response) {
super.renderHead(response);
- if (org.apache.cxf.common.util.CollectionUtils.isEmpty(attrs.getObject())
- && org.apache.cxf.common.util.CollectionUtils.isEmpty(membershipTOs.getObject())) {
+ if (CollectionUtils.isEmpty(attrs.getObject())
+ && CollectionUtils.isEmpty(membershipTOs.getObject())) {
response.render(OnDomReadyHeaderItem.forScript(
String.format("$('#emptyPlaceholder').append(\"%s\"); $('#attributes').hide();",
getString("attribute.empty.list"))));