You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by fm...@apache.org on 2017/05/24 09:16:07 UTC
syncope git commit: [SYNCOPE-1090] provides Type emptyness control
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 <fa...@gmail.com>
Authored: Wed May 24 11:15:51 2017 +0200
Committer: fmartelli <fa...@gmail.com>
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<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/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<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);