Repository: syncope Updated Branches: refs/heads/master 67568240f -> 87ac9bccb
[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/87ac9bcc Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/87ac9bcc Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/87ac9bcc Branch: refs/heads/master Commit: 87ac9bccbb9fab9003f36c1301ac72fade05ab16 Parents: 6756824 Author: fmartelli <[email protected]> Authored: Wed May 24 11:15:51 2017 +0200 Committer: fmartelli <[email protected]> Committed: Wed May 24 11:16:23 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/87ac9bcc/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<SearchClause> { @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/87ac9bcc/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<UserTO> implements UserF protected Details<UserTO> addOptionalDetailsPanel(final AnyWrapper<UserTO> 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);
