Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 0A05A200C7F for ; Wed, 24 May 2017 11:16:10 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 08A4B160BD0; Wed, 24 May 2017 09:16:10 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4EB47160BB4 for ; Wed, 24 May 2017 11:16:09 +0200 (CEST) Received: (qmail 38968 invoked by uid 500); 24 May 2017 09:16:07 -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 38959 invoked by uid 99); 24 May 2017 09:16:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 May 2017 09:16:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9F4B2DFAEB; Wed, 24 May 2017 09:16:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: fmartelli@apache.org To: commits@syncope.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: syncope git commit: [SYNCOPE-1090] provides Type emptyness control Date: Wed, 24 May 2017 09:16:07 +0000 (UTC) archived-at: Wed, 24 May 2017 09:16:10 -0000 Repository: syncope Updated Branches: refs/heads/2_0_X 04f255360 -> 8d6dc235c [SYNCOPE-1090] provides Type emptyness control Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8d6dc235 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8d6dc235 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8d6dc235 Branch: refs/heads/2_0_X Commit: 8d6dc235c38841d38b3075163b1d1ca46c8817b1 Parents: 04f2553 Author: fmartelli Authored: Wed May 24 11:15:51 2017 +0200 Committer: fmartelli Committed: Wed May 24 11:15:51 2017 +0200 ---------------------------------------------------------------------- .../syncope/client/console/panels/search/SearchClausePanel.java | 4 +++- .../syncope/client/console/wizards/any/UserWizardBuilder.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/8d6dc235/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java index 47567b2..12f9d86 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java @@ -435,7 +435,9 @@ public class SearchClausePanel extends FieldPanel { @Override protected void onUpdate(final AjaxRequestTarget target) { final SearchClause searchClause = new SearchClause(); - searchClause.setType(Type.valueOf(type.getDefaultModelObjectAsString())); + if (StringUtils.isNotEmpty(type.getDefaultModelObjectAsString())) { + searchClause.setType(Type.valueOf(type.getDefaultModelObjectAsString())); + } SearchClausePanel.this.clause.setObject(searchClause); setFieldAccess(searchClause.getType(), property, comparator, value); http://git-wip-us.apache.org/repos/asf/syncope/blob/8d6dc235/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java index 0b2652c..d2afa25 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java @@ -81,7 +81,8 @@ public class UserWizardBuilder extends AnyWizardBuilder implements UserF protected Details addOptionalDetailsPanel(final AnyWrapper modelObject) { return new UserDetails( - UserWrapper.class.cast(modelObject), mode == AjaxWizard.Mode.TEMPLATE, + UserWrapper.class.cast(modelObject), + mode == AjaxWizard.Mode.TEMPLATE, modelObject.getInnerObject().getKey() != null, UserFormLayoutInfo.class.cast(formLayoutInfo).isPasswordManagement(), pageRef);