Author: jleroux
Date: Sun May 1 14:45:46 2016
New Revision: 1741866
URL: http://svn.apache.org/viewvc?rev=1741866&view=rev
Log:
"Continue the work on the form widget grid element" -
https://issues.apache.org/jira/browse/OFBIZ-7029
This
Updates the XSD documentation
Removes the list type when the grid element is used
Modified:
ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
ofbiz/trunk/framework/widget/dtd/widget-form.xsd
ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml
Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml?rev=1741866&r1=1741865&r2=1741866&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetForms.xml Sun May 1
14:45:46 2016
@@ -21,7 +21,7 @@ under the License.
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd";>
<!-- list all assets in a tabular format -->
- <grid name="ListFixedAssets" type="list" list-name="listIt"
paginate-target="ListFixedAssets"
+ <grid name="ListFixedAssets" list-name="listIt"
paginate-target="ListFixedAssets"
odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
<actions>
<service service-name="performFind" result-map="result"
result-map-list="listIt">
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=1741866&r1=1741865&r2=1741866&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml Sun May 1
14:45:46 2016
@@ -125,7 +125,7 @@ under the License.
</sort-order>
</form>
- <grid name="ListParty" type="list" target="deletePartyRate"
list-name="listIt"
+ <grid name="ListParty" target="deletePartyRate" list-name="listIt"
odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
<actions>
<service service-name="performFindParty"
auto-field-map="parameters" result-map-list="listIt"/>
@@ -176,7 +176,7 @@ under the License.
<grid name="ListPartyO" extends="ListParty">
<field name="infoString"
title="${uiLabelMap.PartyContactInformation}"><display/></field>
</grid>
- <grid name="ListPartyUserLogin" type="list" list-name="logins"
default-table-style="basic-table" hide-header="true">
+ <grid name="ListPartyUserLogin" list-name="logins"
default-table-style="basic-table" hide-header="true">
<field name="userLoginId"><display/></field>
<field name="enabled"><display/></field>
<field name="disabledDateTime"><display type="date"/></field>
Modified: ofbiz/trunk/framework/widget/dtd/widget-form.xsd
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/dtd/widget-form.xsd?rev=1741866&r1=1741865&r2=1741866&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/dtd/widget-form.xsd (original)
+++ ofbiz/trunk/framework/widget/dtd/widget-form.xsd Sun May 1 14:45:46 2016
@@ -56,7 +56,7 @@ under the License.
</xs:enumeration>
<xs:enumeration value="list">
<xs:annotation>
- <xs:documentation>a list form is a list of
individual forms in a table (could be called a tabular form), it has a list of
sets of values and creates one form for each list element</xs:documentation>
+ <xs:documentation>DEPRECATED use grid instead
- a list form is a list of individual forms in a table (could be called a
tabular form), it has a list of sets of values and creates one form for each
list element</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="multi">
@@ -293,6 +293,11 @@ under the License.
</xs:complexType>
</xs:element>
<xs:element name="grid">
+ <xs:annotation>
+ <xs:documentation>
+ a list of individual forms in a table (could be called a
tabular form), it has a list of sets of values and creates one form for each
list element
+ </xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" ref="actions" />
@@ -306,33 +311,6 @@ under the License.
<xs:element minOccurs="0" ref="sort-order" />
</xs:sequence>
<xs:attribute name="name" type="xs:string" use="required" />
- <xs:attribute name="type">
- <xs:annotation>
- <xs:documentation>The form type is always required unless
you are extending another form.</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="single">
- <xs:annotation>
- <xs:documentation>a single form is a simple
single form with values from a single set of values</xs:documentation>
- </xs:annotation>
- </xs:enumeration>
- <xs:enumeration value="list">
- <xs:annotation>
- <xs:documentation>a list form is a list of
individual forms in a table (could be called a tabular form), it has a list of
sets of values and creates one form for each list element</xs:documentation>
- </xs:annotation>
- </xs:enumeration>
- <xs:enumeration value="multi">
- <xs:annotation>
- <xs:documentation>a multi form is like a
list/tabular form, but it creates a single form to submit all list item forms
at once; the field names in the resulting form have an appendage attached to
make them unique according to the pattern used for the multi-service
- event handler that will call one service
for each list element</xs:documentation>
- </xs:annotation>
- </xs:enumeration>
- <xs:enumeration value="upload">
- </xs:enumeration>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
<xs:attribute name="target" type="xs:string" />
<xs:attribute name="target-window" type="xs:string" />
<xs:attribute name="target-type" default="intra-app">
Modified: ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml?rev=1741866&r1=1741865&r2=1741866&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml
(original)
+++ ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml Sun May
1 14:45:46 2016
@@ -115,7 +115,7 @@ under the License.
</actions>
<field name="status"><include-grid name="ExampleStatusInLine"
location="component://example/widget/example/ExampleForms.xml"/></field>
</form>
- <grid name="ExampleStatusInLine" type="list"
default-table-style="basic-table light-grid"
default-entity-name="ExampleStatus">
+ <grid name="ExampleStatusInLine" default-table-style="basic-table
light-grid" default-entity-name="ExampleStatus">
<actions>
<entity-condition entity-name="ExampleStatus">
<condition-expr field-name="exampleId" from-field="exampleId"/>
