[SYNCOPE-813] mandatory condition for configuration parameters not available anymore from administration console
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/762178b1 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/762178b1 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/762178b1 Branch: refs/heads/master Commit: 762178b15fb3555c58813ede0caa87d9740f9064 Parents: d9ec96b Author: fmartelli <fabio.marte...@gmail.com> Authored: Thu Mar 24 16:45:51 2016 +0100 Committer: fmartelli <fabio.marte...@gmail.com> Committed: Thu Mar 24 17:19:54 2016 +0100 ---------------------------------------------------------------------- .../console/panels/ParametersCreateWizardSchemaStep.java | 8 ++------ .../console/panels/ParametersCreateWizardSchemaStep.html | 1 - .../src/main/resources/domains/MasterContent.xml | 3 +-- .../src/test/resources/domains/MasterContent.xml | 3 +-- 4 files changed, 4 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/762178b1/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersCreateWizardSchemaStep.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersCreateWizardSchemaStep.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersCreateWizardSchemaStep.java index 4a4cb7f..fd8544f 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersCreateWizardSchemaStep.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersCreateWizardSchemaStep.java @@ -40,6 +40,8 @@ public class ParametersCreateWizardSchemaStep extends WizardStep { private static final long serialVersionUID = -7843275202297616553L; public ParametersCreateWizardSchemaStep(final ParametersCreateWizardPanel.ParametersForm modelObject) { + modelObject.getPlainSchemaTO().setMandatoryCondition("false"); + final WebMarkupContainer content = new WebMarkupContainer("content"); this.setOutputMarkupId(true); content.setOutputMarkupId(true); @@ -107,14 +109,8 @@ public class ParametersCreateWizardSchemaStep extends WizardStep { } }); - final AjaxTextFieldPanel mandatoryCondition = new AjaxTextFieldPanel( - "mandatoryCondition", getString("mandatoryCondition"), - new PropertyModel<String>(modelObject.getPlainSchemaTO(), "mandatoryCondition")); - content.add(mandatoryCondition); - final AjaxCheckBoxPanel multiValue = new AjaxCheckBoxPanel("panel", getString("multivalue"), new PropertyModel<Boolean>(modelObject.getPlainSchemaTO(), "multivalue"), false); content.add(multiValue); } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/762178b1/client/console/src/main/resources/org/apache/syncope/client/console/panels/ParametersCreateWizardSchemaStep.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ParametersCreateWizardSchemaStep.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ParametersCreateWizardSchemaStep.html index 320ae7a..c707e98 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ParametersCreateWizardSchemaStep.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ParametersCreateWizardSchemaStep.html @@ -21,7 +21,6 @@ under the License. <div wicket:id="content"> <span wicket:id="type">[type]</span> <span wicket:id="values">[values]</span> - <span wicket:id="mandatoryCondition">[mandatoryCondition]</span> <span wicket:id="panel">[panel]</span> </div> </wicket:panel> http://git-wip-us.apache.org/repos/asf/syncope/blob/762178b1/core/persistence-jpa/src/main/resources/domains/MasterContent.xml ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/main/resources/domains/MasterContent.xml b/core/persistence-jpa/src/main/resources/domains/MasterContent.xml index 1d59b71..f71c409 100644 --- a/core/persistence-jpa/src/main/resources/domains/MasterContent.xml +++ b/core/persistence-jpa/src/main/resources/domains/MasterContent.xml @@ -68,8 +68,7 @@ under the License. <CPlainAttr id="8" owner_id="1" schema_name="passwordReset.securityQuestion"/> <CPlainAttrValue id="8" attribute_id="8" booleanValue="1"/> - <PlainSchema name="authentication.statuses" type="String" - mandatoryCondition="true" multivalue="1" uniqueConstraint="0" readonly="0"/> + <PlainSchema name="authentication.statuses" type="String" multivalue="1" uniqueConstraint="0" readonly="0"/> <CPlainAttr id="9" owner_id="1" schema_name="authentication.statuses"/> <CPlainAttrValue id="9" attribute_id="9" stringValue="created"/> <CPlainAttrValue id="10" attribute_id="9" stringValue="active"/> http://git-wip-us.apache.org/repos/asf/syncope/blob/762178b1/core/persistence-jpa/src/test/resources/domains/MasterContent.xml ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml index 0e1805d..9a9696f 100644 --- a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml +++ b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml @@ -68,8 +68,7 @@ under the License. <CPlainAttr id="8" owner_id="1" schema_name="passwordReset.securityQuestion"/> <CPlainAttrValue id="8" attribute_id="8" booleanValue="1"/> - <PlainSchema name="authentication.statuses" type="String" - mandatoryCondition="true" multivalue="1" uniqueConstraint="0" readonly="0"/> + <PlainSchema name="authentication.statuses" type="String" multivalue="1" uniqueConstraint="0" readonly="0"/> <CPlainAttr id="9" owner_id="1" schema_name="authentication.statuses"/> <CPlainAttrValue id="9" attribute_id="9" stringValue="created"/> <CPlainAttrValue id="10" attribute_id="9" stringValue="active"/>
