This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 225e32f [SYNCOPE-1476] fixes enum schema creation, final solution
improving AbstractMultiPanel
225e32f is described below
commit 225e32f9244e70d4b3bef2fef29e412a01493aad
Author: Andrea Patricelli <[email protected]>
AuthorDate: Tue Jun 4 17:10:35 2019 +0200
[SYNCOPE-1476] fixes enum schema creation, final solution improving
AbstractMultiPanel
---
.../client/ui/commons/markup/html/form/AbstractMultiPanel.java | 7 ++++++-
.../org/apache/syncope/client/console/panels/SchemaTypePanel.java | 3 ---
.../console/wicket/markup/html/bootstrap/dialog/BaseModal.java | 3 +--
.../org/apache/syncope/client/console/wizards/WizardMgtPanel.java | 6 ------
.../org/apache/syncope/client/console/wizards/any/PlainAttrs.java | 6 ++++--
5 files changed, 11 insertions(+), 14 deletions(-)
diff --git
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AbstractMultiPanel.java
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AbstractMultiPanel.java
index e042cbc..e4eb01a 100644
---
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AbstractMultiPanel.java
+++
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AbstractMultiPanel.java
@@ -59,7 +59,6 @@ public abstract class AbstractMultiPanel<INNER> extends
AbstractFieldPanel<List<
form = new Form<>("innerForm");
form.setDefaultButton(null);
- form.setMultiPart(true);
container.add(form);
// -----------------------
@@ -73,6 +72,12 @@ public abstract class AbstractMultiPanel<INNER> extends
AbstractFieldPanel<List<
}
}
+ // SYNCOPE-1476
+ public AbstractMultiPanel<INNER> setFormAsMultipart(final boolean
multipart) {
+ form.setMultiPart(multipart);
+ return this;
+ }
+
private Fragment getNoDataFragment(final IModel<List<INNER>> model, final
String label) {
final Fragment fragment = new Fragment("content", "noDataFragment",
AbstractMultiPanel.this);
fragment.add(new Label("field-label", new ResourceModel(label,
label)));
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
index ecdb870..ff20636 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
@@ -84,9 +84,6 @@ public class SchemaTypePanel extends
TypesDirectoryPanel<SchemaTO, SchemaProvide
super(id, true, pageRef);
this.schemaType = schemaType;
- // SYNCOPE-1476
- setFormAsMultipart(true);
-
disableCheckBoxes();
try {
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.java
index f1e1107..9a339e1 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.java
@@ -127,8 +127,7 @@ public class BaseModal<T extends Serializable> extends
Modal<T> {
return this;
}
- // SYNCOPE-1476
- public BaseModal<T> setFormMultipart(final boolean multipart) {
+ public BaseModal<T> setFormAsMultipart(final boolean multipart) {
form.setMultiPart(multipart);
return this;
}
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
index 33399fd..286260f 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
@@ -353,12 +353,6 @@ public abstract class WizardMgtPanel<T extends
Serializable> extends AbstractWiz
return this;
}
- // SYNCOPE-1476
- public WizardMgtPanel<T> setFormAsMultipart(final boolean multipart) {
- this.modal.setFormMultipart(multipart);
- return this;
- }
-
/**
* Set window close callback for the given modal.
*
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
index 981842b..db02d27 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
@@ -442,6 +442,7 @@ public class PlainAttrs extends
AbstractAttrs<PlainSchemaTO> {
}
});
} else {
+ // SYNCOPE-1476 set form as multipart to properly
manage membership attributes
panel = new MultiFieldPanel.Builder<>(new
ListModel<String>() {
private static final long serialVersionUID =
-1765231556272935141L;
@@ -452,7 +453,7 @@ public class PlainAttrs extends
AbstractAttrs<PlainSchemaTO> {
}
}).build("panel",
attrTO.getSchema(),
- FieldPanel.class.cast(panel));
+
FieldPanel.class.cast(panel)).setFormAsMultipart(true);
// SYNCOPE-1215 the entire multifield panel must be
readonly, not only its field
((MultiFieldPanel)
panel).setReadOnly(schemas.get(attrTO.getSchema()).isReadonly());
}
@@ -490,11 +491,12 @@ public class PlainAttrs extends
AbstractAttrs<PlainSchemaTO> {
FieldPanel.class.cast(panel).setNewModel(attrTO.getValues());
} else {
+ // SYNCOPE-1476 set form as multipart to properly
manage membership attributes
panel = new MultiFieldPanel.Builder<>(
new PropertyModel<>(attrTO, "values")).build(
"panel",
attrTO.getSchema(),
- FieldPanel.class.cast(panel));
+
FieldPanel.class.cast(panel)).setFormAsMultipart(true);
// SYNCOPE-1215 the entire multifield panel must be
readonly, not only its field
((MultiFieldPanel)
panel).setReadOnly(schemas.get(attrTO.getSchema()).isReadonly());
}
