Skip to content

Commit

Permalink
Unification of mapping and form schema
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed Jan 27, 2017
1 parent 65d35dc commit 9124b0c
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 39 deletions.
4 changes: 2 additions & 2 deletions ...n-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
View file
Expand Up @@ -87,7 +87,7 @@ private void initLayout(String groupName, List<AbstractFormItemType> formItems,
for (AbstractFormItemType formItem : formItems) {

if (formItem instanceof FormFieldGroupType) {
DynamicFieldGroupPanel<O> dynamicFieldGroupPanel = new DynamicFieldGroupPanel<O>(itemView.newChildId(), formItem.getName(), getModel(), FormTypeUtil.getFormItems(((FormFieldGroupType) formItem).getFormItems()), mainForm, getPageBase());
DynamicFieldGroupPanel<O> dynamicFieldGroupPanel = new DynamicFieldGroupPanel<O>(itemView.newChildId(), formItem.getName().getLocalPart(), getModel(), FormTypeUtil.getFormItems(((FormFieldGroupType) formItem).getFormItems()), mainForm, getPageBase());
dynamicFieldGroupPanel.setOutputMarkupId(true);
itemView.add(dynamicFieldGroupPanel);
continue;
Expand All @@ -113,7 +113,7 @@ private void initLayout(String groupName, List<AbstractFormItemType> formItems,
}

private ItemWrapper createItemWrapper(AbstractFormItemType formField, ObjectWrapper objectWrapper) {
ItemPathType itemPathType = formField.getRef();
ItemPathType itemPathType = formField.getPath();

if (itemPathType == null) {
getSession().error("Bad form item definition. It has to contain reference to the real attribute");
Expand Down
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
View file
Expand Up @@ -183,7 +183,7 @@ public List<ItemPath> getChangedItems() {

private Collection<? extends ItemPath> collectItemPaths(List<AbstractFormItemType> items, List<ItemPath> paths) {
for (AbstractFormItemType aItem : items) {
ItemPathType itemPathType = aItem.getRef();
ItemPathType itemPathType = aItem.getPath();
if (itemPathType != null) {
paths.add(itemPathType.getItemPath());
}
Expand Down
68 changes: 32 additions & 36 deletions infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
View file
Expand Up @@ -5978,6 +5978,16 @@
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="type" type="xsd:QName" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
Type override. Normally the field type will be determined
by the type of backing item. This field can be used as type
override if a different presenation is required.
NOT IMPLEMENTED YET
</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:complexType>

Expand Down Expand Up @@ -13974,42 +13984,28 @@
Abstract supertype for all form items.
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="name" type="xsd:string" minOccurs="0"></xsd:element>
<xsd:element ref="tns:description" minOccurs="0" />
<xsd:element name="ref" type="t:ItemPathType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
Reference to an item of the backing object that is behind the form.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="type" type="xsd:QName" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
Type override. Normally the field type will be determined
by the type of backing item. This field can be used as type
override if a different presenation is required.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="display" type="tns:FormItemDisplayType" minOccurs="0" />
<xsd:element name="widget" type="xsd:string" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
Name of the UI widget that should be used to display this item.
Normally, the widget will be chosen automatically based on the type
of the backing item (see "ref" element). The "widget" element can be
used to override this default behavior. It is used for default included
types like text, label, combo, password, checkbox, etc. or class name for
custom implementation.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="availableValues" type="c:ExpressionType" minOccurs="0" />
<xsd:element name="validation" type="tns:FormItemValidationType" minOccurs="0" />
<!-- TODO: condition -->
</xsd:sequence>
<xsd:complexContent>
<xsd:extension base="tns:VariableBindingDefinitionType">
<xsd:sequence>
<xsd:element name="display" type="tns:FormItemDisplayType" minOccurs="0" />
<xsd:element name="widget" type="xsd:string" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
Name of the UI widget that should be used to display this item.
Normally, the widget will be chosen automatically based on the type
of the backing item (see "ref" element). The "widget" element can be
used to override this default behavior. It is used for default included
types like text, label, combo, password, checkbox, etc. or class name for
custom implementation.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<!-- Note: available values are defined by the "set" in the supertype. -->
<xsd:element name="validation" type="tns:FormItemValidationType" minOccurs="0" />
<!-- TODO: condition -->
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
<xsd:element name="formItem" type="tns:AbstractFormItemType" abstract="true" />

Expand Down

0 comments on commit 9124b0c

Please sign in to comment.