You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by nm...@apache.org on 2015/06/20 23:28:13 UTC
svn commit: r1686673 - in /ofbiz/trunk:
applications/party/widget/partymgr/PartyForms.xml
framework/widget/dtd/widget-form.xsd
specialpurpose/example/widget/example/ExampleForms.xml
Author: nmalin
Date: Sat Jun 20 21:28:12 2015
New Revision: 1686673
URL: http://svn.apache.org/r1686673
Log:
Use as default on <entity-option> and <list-option> description attribute like <display-entity> element. Related issues OFBIZ-6489 and OFBIZ-6490. Thanks to Christian Carlow for this and Gil Portenseigne for the review
Modified:
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/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=1686673&r1=1686672&r2=1686673&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml Sat Jun 20 21:28:12 2015
@@ -1176,7 +1176,7 @@ under the License.
<field name="partyId"><hidden value="${parameters.partyId}"/></field>
<field name="roleTypeId">
<drop-down allow-empty="false">
- <entity-options entity-name="RoleType" description="${description}">
+ <entity-options entity-name="RoleType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -1217,7 +1217,7 @@ under the License.
<field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}" required-field="true" entry-name="dummy" position="1"><text/></field>
<field name="parentTypeId" position="2">
<drop-down allow-empty="true">
- <list-options list-name="parentRoleList" key-name="roleTypeId" description="${description}"/>
+ <list-options list-name="parentRoleList" key-name="roleTypeId"/>
</drop-down>
</field>
<field name="description" title="${uiLabelMap.CommonDescription}" required-field="true"><text/></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=1686673&r1=1686672&r2=1686673&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/dtd/widget-form.xsd (original)
+++ ofbiz/trunk/framework/widget/dtd/widget-form.xsd Sat Jun 20 21:28:12 2015
@@ -1825,7 +1825,7 @@ under the License.
<xs:documentation>The name of the field in the looked up entity that will be used for the key value; if empty defaults to the entry-name of the field this is in.</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="description" use="required">
+ <xs:attribute type="xs:string" name="description" default="${description}">
<xs:annotation>
<xs:documentation>Will be presented to the user with field values substituted using the ${} syntax.</xs:documentation>
</xs:annotation>
@@ -1964,7 +1964,7 @@ under the License.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="description">
+ <xs:attribute type="xs:string" name="description" default="${description}">
<xs:annotation>
<xs:documentation>Will be presented to the user with field values substituted using the ${} syntax.</xs:documentation>
</xs:annotation>
Modified: ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml?rev=1686673&r1=1686672&r2=1686673&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml (original)
+++ ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml Sat Jun 20 21:28:12 2015
@@ -27,14 +27,14 @@ under the License.
<field name="exampleName" title="${uiLabelMap.CommonName}"><text-find/></field>
<field name="exampleTypeId" title="${uiLabelMap.CommonType}">
<drop-down allow-empty="true" current-description="">
- <entity-options description="${description}" key-field-name="exampleTypeId" entity-name="ExampleType">
+ <entity-options key-field-name="exampleTypeId" entity-name="ExampleType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true" current-description="">
- <entity-options description="${description}" key-field-name="statusId" entity-name="ExampleStatusItem"/>
+ <entity-options key-field-name="statusId" entity-name="ExampleStatusItem"/>
</drop-down>
</field>
<field name="listOtherElements">