Repository: syncope Updated Branches: refs/heads/2_0_X afea27ae6 -> 7fed99aa0
[SYNCOPE-1181] When adding a new condition in a 'SearchPanel', it is now mandatory to fill the dropdowns first Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7fed99aa Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7fed99aa Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7fed99aa Branch: refs/heads/2_0_X Commit: 7fed99aa0e7972414258bb12d3b41b6c212704d1 Parents: afea27a Author: skylark17 <matteo.alessandr...@tirasa.net> Authored: Fri Aug 11 12:48:02 2017 +0200 Committer: skylark17 <matteo.alessandr...@tirasa.net> Committed: Fri Aug 11 12:48:23 2017 +0200 ---------------------------------------------------------------------- .../org/apache/syncope/client/console/panels/AnyPanel.java | 6 +++--- .../syncope/client/console/wizards/any/DynamicMemberships.java | 2 +- .../syncope/client/console/wizards/role/RoleWizardBuilder.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/7fed99aa/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java index d1aa9fc..127471b 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java @@ -201,7 +201,7 @@ public class AnyPanel extends Panel implements ModalPanel { clause.setProperty("username"); panel = new UserSearchPanel.Builder( - new ListModel<>(clauses)).required(false).enableSearch().build(id); + new ListModel<>(clauses)).required(true).enableSearch().build(id); break; case GROUP: clause.setComparator(SearchClause.Comparator.EQUALS); @@ -209,7 +209,7 @@ public class AnyPanel extends Panel implements ModalPanel { clause.setProperty("name"); panel = new GroupSearchPanel.Builder( - new ListModel<>(clauses)).required(false).enableSearch().build(id); + new ListModel<>(clauses)).required(true).enableSearch().build(id); break; case ANY_OBJECT: clause.setComparator(SearchClause.Comparator.EQUALS); @@ -217,7 +217,7 @@ public class AnyPanel extends Panel implements ModalPanel { clause.setProperty("name"); panel = new AnyObjectSearchPanel.Builder(anyTypeTO.getKey(), - new ListModel<>(clauses)).required(false).enableSearch().build(id); + new ListModel<>(clauses)).required(true).enableSearch().build(id); break; default: panel = null; http://git-wip-us.apache.org/repos/asf/syncope/blob/7fed99aa/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DynamicMemberships.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DynamicMemberships.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DynamicMemberships.java index 2f73fa8..5da9273 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DynamicMemberships.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DynamicMemberships.java @@ -80,7 +80,7 @@ public class DynamicMemberships extends WizardStep { @Override public Panel getPanel(final String panelId) { return new UserSearchPanel.Builder(new PropertyModel<List<SearchClause>>(groupWrapper, "uDynClauses")). - required(false).build(panelId); + required(true).build(panelId); } }), Model.of(StringUtils.isBlank(groupWrapper.getUDynMembershipCond()) ? -1 : 0)).setOutputMarkupId(true)); // ------------------------ http://git-wip-us.apache.org/repos/asf/syncope/blob/7fed99aa/client/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java index 49f377b..4f60fa5 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java @@ -120,7 +120,7 @@ public class RoleWizardBuilder extends AjaxWizardBuilder<RoleWrapper> { public Panel getPanel(final String panelId) { return new UserSearchPanel.Builder( new PropertyModel<List<SearchClause>>(modelObject, "dynClauses")). - required(false).build(panelId); + required(true).build(panelId); } }), Model.of(StringUtils.isBlank(modelObject.getDynMembershipCond()) ? -1 : 0)).setOutputMarkupId(true)); // ------------------------
