From commits-return-13158-archive-asf-public=cust-asf.ponee.io@syncope.apache.org Mon Mar 4 10:22:43 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id ABF2C180627 for ; Mon, 4 Mar 2019 11:22:42 +0100 (CET) Received: (qmail 20354 invoked by uid 500); 4 Mar 2019 10:22:41 -0000 Mailing-List: contact commits-help@syncope.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@syncope.apache.org Delivered-To: mailing list commits@syncope.apache.org Received: (qmail 20344 invoked by uid 99); 4 Mar 2019 10:22:41 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Mar 2019 10:22:41 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 31B348776A; Mon, 4 Mar 2019 10:22:41 +0000 (UTC) Date: Mon, 04 Mar 2019 10:22:41 +0000 To: "commits@syncope.apache.org" Subject: [syncope] branch 2_1_X updated: [SYNCOPE-1432] Topology now shows new created connectors and resources with no need of refreshing page MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155169496093.5060.7876589975531031697@gitbox.apache.org> From: skylark17@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: syncope X-Git-Refname: refs/heads/2_1_X X-Git-Reftype: branch X-Git-Oldrev: a823a7a2a17f4473e9b08580e9779c53eb12023f X-Git-Newrev: 09caa03623acb526af229a5307b79b3a7313d56d X-Git-Rev: 09caa03623acb526af229a5307b79b3a7313d56d X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. skylark17 pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_1_X by this push: new 09caa03 [SYNCOPE-1432] Topology now shows new created connectors and resources with no need of refreshing page 09caa03 is described below commit 09caa03623acb526af229a5307b79b3a7313d56d Author: skylark17 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/SyncopeConsoleApplication.java | 4 ++-- .../org/apache/syncope/client/console/wizards/any/AbstractAttrs.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java index e7b2035..af3c2f3 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java @@ -56,8 +56,8 @@ import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication; 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.request.cycle.IRequestCycleListener; import org.apache.wicket.protocol.ws.api.WebSocketResponse; import org.apache.wicket.request.cycle.RequestCycle; @@ -206,7 +206,7 @@ public class SyncopeConsoleApplication extends AuthenticatedWebApplication { 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/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java index 7a315d6..fc65634 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java +++ b/client/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 extends WizardStep imple @Override public void renderHead(final IHeaderResponse response) { super.renderHead(response); - if (org.apache.cxf.common.util.CollectionUtils.isEmpty(attrTOs.getObject()) - && org.apache.cxf.common.util.CollectionUtils.isEmpty(membershipTOs.getObject())) { + if (CollectionUtils.isEmpty(attrTOs.getObject()) + && CollectionUtils.isEmpty(membershipTOs.getObject())) { response.render(OnDomReadyHeaderItem.forScript( String.format("$('#emptyPlaceholder').append(\"%s\"); $('#attributes').hide();", getString("attribute.empty.list"))));