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:58:07 UTC
svn commit: r1686674 [8/9] - in /ofbiz/trunk:
applications/accounting/widget/ applications/accounting/widget/ap/forms/
applications/accounting/widget/ar/forms/
applications/commonext/widget/ofbizsetup/ applications/content/widget/cms/
applications/cont...
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml Sat Jun 20 21:58:05 2015
@@ -26,7 +26,7 @@
<field name="instanceOfProductId" title="${uiLabelMap.AccountingInstanceOfProductId}"><text-find ignore-case="true"/></field>
<field name="classEnumId" title="${uiLabelMap.AccountingFixedAssetClassEnumId}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="FXAST_CLASS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -43,14 +43,14 @@
<field name="maintHistSeqId"><text-find ignore-case="true"/></field>
<field name="productMaintTypeId" title="${uiLabelMap.AccountingFixedAssetMaintType}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="ProductMaintType">
+ <entity-options entity-name="ProductMaintType">
<entity-order-by field-name="productMaintTypeId"/>
</entity-options>
</drop-down>
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="StatusItem">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="FIXEDAST_MNT_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -110,7 +110,7 @@
header-row-style="header-row" default-table-style="basic-table">
<field name="facilityId">
<drop-down>
- <entity-options description="${description}" entity-name="Facility">
+ <entity-options entity-name="Facility">
<entity-constraint name="facilityTypeId" value="WAREHOUSE"/>
<entity-order-by field-name="facilityId"/>
</entity-options>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml Sat Jun 20 21:58:05 2015
@@ -129,14 +129,14 @@
<field name="productId"><hidden/></field>
<field name="productMaintSeqId"><hidden/></field>
<field name="productMaintTypeId">
- <display-entity entity-name="ProductMaintType" key-field-name="productMaintTypeId" description="${description}"/>
+ <display-entity entity-name="ProductMaintType" key-field-name="productMaintTypeId"/>
</field>
<field name="maintName"><display/></field>
<field name="intervalMeterTypeId">
- <display-entity entity-name="ProductMeterType" key-field-name="productMeterTypeId" description="${description}"/>
+ <display-entity entity-name="ProductMeterType" key-field-name="productMeterTypeId"/>
</field>
<field name="intervalUomId">
- <display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/>
+ <display-entity entity-name="Uom" key-field-name="uomId"/>
</field>
<field name="intervalQuantity"><text/></field>
<field name="repeatCount"><text/></field>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml Sat Jun 20 21:58:05 2015
@@ -38,27 +38,27 @@
<field name="workEffortIdTo"><hidden value="${parameters.workEffortId}"/></field>
<field name="fromDate"><hidden value="${parameters.fromDate}"/></field>
<field map-name="workEffortAssoc" name="workEffortAssocTypeId" title="${uiLabelMap.FormFieldTitle_workEffortAssocTypeId}" use-when="workEffortIdFrom!=null">
- <display-entity entity-name="WorkEffortAssocType" description="${description}"/>
+ <display-entity entity-name="WorkEffortAssocType"/>
</field>
<!-- End of child workeffort fields -->
<field map-name="workEffort" name="workEffortPurposeTypeId" title="${uiLabelMap.CommonPurpose}" position="1">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
+ <entity-options entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
<entity-order-by field-name="workEffortPurposeTypeId"/>
</entity-options>
</drop-down>
</field>
<field map-name="workEffort" name="currentStatusId" title="${uiLabelMap.CommonStatus}*" position="1">
<drop-down>
- <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" value="TASK_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
- <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" value="EVENT_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
- <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusId" value="CAL_CANCELLED"/>
</entity-options>
</drop-down>
@@ -87,7 +87,7 @@
</actions>
<field name="roleTypeId">
<drop-down>
- <list-options list-name="listMaintRoles" key-name="roleTypeId" description="${description}"/>
+ <list-options list-name="listMaintRoles" key-name="roleTypeId"/>
</drop-down>
</field>
<field name="fromDate"><date-time default-value="${nowTimestamp}"/></field>
@@ -123,7 +123,7 @@
<field name="workEffortAssocTypeId">
<drop-down>
- <entity-options entity-name="WorkEffortAssocType" description="${description}">
+ <entity-options entity-name="WorkEffortAssocType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -134,18 +134,18 @@
<field name="workEffortName" title="${uiLabelMap.CommonName}"><text size="30"/></field>
<field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
<drop-down>
- <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" value="TASK_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
- <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusId" value="CAL_CANCELLED"/>
</entity-options>
</drop-down>
</field>
<field name="workEffortPurposeTypeId" title="${uiLabelMap.CommonPurpose}">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
+ <entity-options entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -171,13 +171,13 @@
</hyperlink>
</field>
<field name="workEffortAssocTypeId">
- <display-entity entity-name="WorkEffortAssocType" description="${description}"/>
+ <display-entity entity-name="WorkEffortAssocType"/>
</field>
<field name="currentStatusId" entry-name="workEffortToCurrentStatusId" title="${uiLabelMap.CommonStatus}">
- <display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/>
+ <display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="workEffortPurposeTypeId" entry-name="workEffortToWorkEffortPurposeTypeId" title="${uiLabelMap.CommonPurpose}">
- <display-entity entity-name="WorkEffortPurposeType" description="${description}"/>
+ <display-entity entity-name="WorkEffortPurposeType"/>
</field>
<field name="actualStartDate" entry-name="workEffortToActualStartDate"><display/></field>
<field name="actualCompletionDate" entry-name="workEffortToActualCompletionDate"><display/></field>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml Sat Jun 20 21:58:05 2015
@@ -29,7 +29,7 @@ under the License.
<field name="fixedAssetTypeId"><hidden value="COMPUTER_HARDWARE"/></field>
<field name="classEnumId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="FXAST_COMPU_HARDWARE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -64,7 +64,7 @@ under the License.
<field name="fixedAssetTypeId"><hidden value="COMPUTER_SOFTWARE"/></field>
<field name="classEnumId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="FXAST_COMPU_SOFTWARE"/>
<entity-order-by field-name="description"/>
</entity-options>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml Sat Jun 20 21:58:05 2015
@@ -33,7 +33,7 @@ under the License.
<field name="instanceOfProductId"><lookup target-form-name="LookupProduct"/></field>
<field name="classEnumId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="FXAST_COMPU_HARDWARE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -74,7 +74,7 @@ under the License.
<field name="instanceOfProductId"><lookup target-form-name="LookupProduct"/></field>
<field name="classEnumId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="FXAST_COMPU_SOFTWARE"/>
<entity-order-by field-name="description"/>
</entity-options>
Modified: ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/widget/facility/FacilityForms.xml Sat Jun 20 21:58:05 2015
@@ -33,7 +33,7 @@ under the License.
</field>
<field name="productTypeId" title="${uiLabelMap.ProductProductType}">
<drop-down allow-empty="true" no-current-selected-key="FINISHED_GOOD">
- <entity-options entity-name="ProductType" description="${description}"> <!-- [${productTypeId}] -->
+ <entity-options entity-name="ProductType"> <!-- [${productTypeId}] -->
<entity-constraint name="isPhysical" value="Y" operator="equals"/>
<entity-constraint name="parentTypeId" value="GOOD" operator="equals"/>
<entity-order-by field-name="description"/>
@@ -51,10 +51,10 @@ under the License.
</field>
<field name="statusId">
<drop-down allow-empty="true">
- <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" operator="equals" value="INV_NON_SER_STTS"/>
</entity-options>
- <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" operator="equals" value="INV_SERIALIZED_STTS"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml Sat Jun 20 21:58:05 2015
@@ -78,7 +78,7 @@ under the License.
<field name="SalesChannel" title="${uiLabelMap.OrderSalesChannel}">
<drop-down allow-empty="false">
<option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
- <entity-options description="${description}" entity-name="Enumeration" key-field-name="description">
+ <entity-options entity-name="Enumeration" key-field-name="description">
<entity-constraint name="enumTypeId" operator="equals" value="ORDER_SALES_CHANNEL"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml Sat Jun 20 21:58:05 2015
@@ -202,7 +202,7 @@ under the License.
<field name="shipmentMethodName"><display/></field>
<field name="methodTypeEnumId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="EBAY_SHIP_TYPE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -211,7 +211,7 @@ under the License.
<field name="carrierPartyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="shipmentMethodTypeId">
<drop-down current="selected" allow-empty="false">
- <entity-options entity-name="ShipmentMethodType" key-field-name="shipmentMethodTypeId" description="${description}"/>
+ <entity-options entity-name="ShipmentMethodType" key-field-name="shipmentMethodTypeId"/>
</drop-down>
</field>
<field name="deleteEbayShippingMethod" title="" widget-style="buttontext">
@@ -227,7 +227,7 @@ under the License.
<auto-fields-service service-name="createEbayShippingMethod"/>
<field name="methodTypeEnumId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="EBAY_SHIP_TYPE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -244,7 +244,7 @@ under the License.
<field name="carrierPartyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="shipmentMethodTypeId">
<drop-down current="selected" allow-empty="false">
- <entity-options entity-name="ShipmentMethodType" description="${description}"/>
+ <entity-options entity-name="ShipmentMethodType"/>
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml Sat Jun 20 21:58:05 2015
@@ -552,7 +552,7 @@ under the License.
<field name="statusId" title="Status">
<drop-down>
<option key="" description="All Status"/>
- <entity-options entity-name="StatusItem" description="${description}">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="ORDER_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml Sat Jun 20 21:58:05 2015
@@ -81,12 +81,12 @@ under the License.
</field>
<field name="section" >
<drop-down no-current-selected-key="${targetSection}" allow-empty="true">
- <list-options list-name="sectionList" key-name="contentId" description="${description}"/>
+ <list-options list-name="sectionList" key-name="contentId"/>
</drop-down>
</field>
<field name="topic" position="1">
<drop-down no-current-selected-key="${targetTopic}" allow-empty="true">
- <entity-options entity-name="Content" key-field-name="contentId" description="${description}">
+ <entity-options entity-name="Content" key-field-name="contentId">
<entity-constraint name="contentTypeId" value="TOPIC"/>
<entity-order-by field-name="contentId"/>
</entity-options>
@@ -256,22 +256,22 @@ under the License.
<field name="textData" title="${uiLabelMap.ContentText}" id-name="textData"><textarea rows="20" cols="60"/></field>
<field name="statusId" >
<drop-down allow-empty="false" no-current-selected-key="SUBSCRIBE_BRONZE">
- <list-options list-name="statusList" key-name="statusId" description="${description}"/>
+ <list-options list-name="statusList" key-name="statusId"/>
</drop-down>
</field>
<field name="privilegeEnumId" >
<drop-down allow-empty="false" no-current-selected-key="SUBSCRIBE_BRONZE">
- <list-options list-name="privilegeList" key-name="enumId" description="${description}"/>
+ <list-options list-name="privilegeList" key-name="enumId"/>
</drop-down>
</field>
<field name="section" >
<drop-down no-current-selected-key="${targetSection}" allow-empty="true">
- <list-options list-name="sectionList" key-name="contentId" description="${description}"/>
+ <list-options list-name="sectionList" key-name="contentId"/>
</drop-down>
</field>
<field name="topic" position="1">
<drop-down no-current-selected-key="${targetTopic}" allow-empty="true">
- <list-options list-name="topicList" key-name="contentId" description="${description}"/>
+ <list-options list-name="topicList" key-name="contentId"/>
</drop-down>
</field>
<!--
@@ -334,7 +334,7 @@ under the License.
<field name="contentId"><display/></field>
<field name="contentTypeId">
<drop-down allow-empty="false">
- <entity-options description="${description}" entity-name="ContentType" key-field-name="contentTypeId"/>
+ <entity-options entity-name="ContentType" key-field-name="contentTypeId"/>
</drop-down>
</field>
<field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}">
@@ -356,12 +356,12 @@ under the License.
</field>
<field name="characterSetId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="CharacterSet" key-field-name="characterSetId"/>
+ <entity-options entity-name="CharacterSet" key-field-name="characterSetId"/>
</drop-down>
</field>
<field name="statusId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" value="CONTENT_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -389,17 +389,17 @@ under the License.
<field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"></field>
<field name="dataResourceTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="DataResourceType" key-field-name="dataResourceTypeId"/>
+ <entity-options entity-name="DataResourceType" key-field-name="dataResourceTypeId"/>
</drop-down>
</field>
<field name="dataTemplateTypeId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/>
+ <entity-options entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/>
</drop-down>
</field>
<field name="statusId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" value="CONTENT_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -419,7 +419,7 @@ under the License.
</field>
<field name="characterSetId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="CharacterSet" key-field-name="characterSetId"/>
+ <entity-options entity-name="CharacterSet" key-field-name="characterSetId"/>
</drop-down>
</field>
<field name="createdDate"><display/></field>
Modified: ofbiz/trunk/specialpurpose/example/widget/example/ExampleFeatureForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/ExampleFeatureForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/widget/example/ExampleFeatureForms.xml (original)
+++ ofbiz/trunk/specialpurpose/example/widget/example/ExampleFeatureForms.xml Sat Jun 20 21:58:05 2015
@@ -91,7 +91,7 @@ under the License.
<field name="fromDate"><display/></field>
<field name="exampleFeatureApplTypeId" title="${uiLabelMap.CommonType}">
<drop-down allow-empty="true">
- <entity-options entity-name="ExampleFeatureApplType" description="${description}">
+ <entity-options entity-name="ExampleFeatureApplType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -125,7 +125,7 @@ under the License.
</field>
<field name="exampleFeatureApplTypeId" title="${uiLabelMap.CommonType}">
<drop-down allow-empty="true">
- <entity-options entity-name="ExampleFeatureApplType" description="${description}">
+ <entity-options entity-name="ExampleFeatureApplType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml (original)
+++ ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml Sat Jun 20 21:58:05 2015
@@ -169,14 +169,14 @@ under the License.
<field name="exampleTypeId" title="${uiLabelMap.CommonType}" id-name="exampleTypeId" widget-style="required">
<drop-down allow-empty="false">
<!-- this is a neat feature, but not good for the type because the user would have to know the possible types in order to enter at least the first letter, so leaving it out by default; just uncomment to enable: <auto-complete/> -->
- <entity-options entity-name="ExampleType" description="${description}">
+ <entity-options entity-name="ExampleType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="statusId" use-when="example==null" title="${uiLabelMap.CommonStatus}" widget-style="required">
<drop-down allow-empty="false">
- <entity-options entity-name="ExampleStatusItem" description="${description}"/>
+ <entity-options entity-name="ExampleStatusItem"/>
</drop-down>
</field>
<field name="statusId" use-when="example!=null" title="${uiLabelMap.CommonStatus}" widget-style="required">
@@ -192,7 +192,7 @@ under the License.
<field name="anotherText">
<drop-down allow-empty="true">
<option key="Explicit Option" description="${uiLabelMap.ExampleExplicitOption}"/>
- <entity-options entity-name="ExampleType" description="${description}" key-field-name="exampleTypeId">
+ <entity-options entity-name="ExampleType" key-field-name="exampleTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -210,7 +210,7 @@ under the License.
<alt-target use-when="example==null" target="createExampleAjax"/>
<field name="statusId" use-when="example==null" title="${uiLabelMap.CommonStatus}" id-name="statusId">
<drop-down allow-empty="false">
- <entity-options entity-name="ExampleStatusItem" description="${description}"/>
+ <entity-options entity-name="ExampleStatusItem"/>
</drop-down>
</field>
<on-event-update-area event-type="submit" area-id="ListExamplesAjax" area-target="ListExampleFormOnly"/>
@@ -272,7 +272,7 @@ under the License.
<auto-fields-service service-name="updateExampleFeatureAppl"/>
<field name="exampleId"><hidden/></field>
<field name="exampleFeatureId" title="${uiLabelMap.ExampleFeature}">
- <display-entity entity-name="ExampleFeature" description="${description}">
+ <display-entity entity-name="ExampleFeature">
<sub-hyperlink target="EditExampleFeature" description="${exampleFeatureId}" link-style="buttontext">
<parameter param-name="exampleFeatureId"/>
</sub-hyperlink>
@@ -281,7 +281,7 @@ under the License.
<field name="fromDate"><display/></field>
<field name="exampleFeatureApplTypeId" title="${uiLabelMap.CommonType}">
<drop-down allow-empty="false">
- <entity-options entity-name="ExampleFeatureApplType" description="${description}">
+ <entity-options entity-name="ExampleFeatureApplType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -304,7 +304,7 @@ under the License.
</field>
<field name="exampleFeatureApplTypeId" title="${uiLabelMap.CommonType}">
<drop-down allow-empty="false">
- <entity-options entity-name="ExampleFeatureApplType" description="${description}">
+ <entity-options entity-name="ExampleFeatureApplType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml (original)
+++ ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml Sat Jun 20 21:58:05 2015
@@ -187,9 +187,7 @@ under the License.
title="${uiLabelMap.ExampleDropDownField3Title}"
tooltip="${uiLabelMap.ExampleToDo}" tooltip-style="button-text">
<drop-down>
- <entity-options entity-name="ExampleType"
- key-field-name="exampleTypeId"
- description="${description}">
+ <entity-options entity-name="ExampleType" key-field-name="exampleTypeId">
<entity-order-by field-name="-description"/>
</entity-options>
</drop-down>
@@ -215,8 +213,7 @@ under the License.
title="${uiLabelMap.ExampleDropDownField6Title}"
tooltip="${uiLabelMap.ExampleToDo}" tooltip-style="button-text">
<drop-down>
- <entity-options entity-name="ExampleType"
- description="${description}"/>
+ <entity-options entity-name="ExampleType"/>
</drop-down>
</field>
<!-- ***************** -->
@@ -226,9 +223,7 @@ under the License.
title="${uiLabelMap.ExampleDropDownField7Title}"
tooltip="${uiLabelMap.ExampleToDo}" tooltip-style="button-text">
<drop-down>
- <entity-options entity-name="ExampleType"
- key-field-name="exampleTypeId"
- description="${description}">
+ <entity-options entity-name="ExampleType" key-field-name="exampleTypeId">
<entity-constraint name="exampleTypeId"
value="INSPIRED"
operator="greater"/>
@@ -394,7 +389,7 @@ under the License.
<form name="SelectionBoxesExampleForm" type="single">
<field name="ExampleTypeId">
<check>
- <entity-options key-field-name="exampleTypeId" description="${description}" entity-name="ExampleType"/>
+ <entity-options key-field-name="exampleTypeId" entity-name="ExampleType"/>
</check>
</field>
</form>
Modified: ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseForms.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseForms.xml Sat Jun 20 21:58:05 2015
@@ -62,7 +62,7 @@ under the License.
<field name="trackingCodeId">
<drop-down no-current-selected-key="_NA_">
<option key="_NA_" description="${uiLabelMap.GoogleBaseExportNoTrackingRequested}"/>
- <entity-options entity-name="TrackingCode" description="${description}">
+ <entity-options entity-name="TrackingCode">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
Modified: ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutForms.xml (original)
+++ ofbiz/trunk/specialpurpose/googlecheckout/widget/GoogleCheckoutForms.xml Sat Jun 20 21:58:05 2015
@@ -32,7 +32,7 @@ under the License.
<field name="productStoreId"><display/></field>
<field name="envEnumId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="GOOGLE_ENV_TYPE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -80,7 +80,7 @@ under the License.
</field>
<field name="envEnumId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="GOOGLE_ENV_TYPE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -124,7 +124,7 @@ under the License.
<field name="shipmentMethodName"><display/></field>
<field name="methodTypeEnumId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="GOOGLE_SHIP_TYPE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -133,7 +133,7 @@ under the License.
<field name="carrierPartyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="shipmentMethodTypeId">
<drop-down current="selected" allow-empty="false">
- <entity-options entity-name="ShipmentMethodType" key-field-name="shipmentMethodTypeId" description="${description}"/>
+ <entity-options entity-name="ShipmentMethodType" key-field-name="shipmentMethodTypeId"/>
</drop-down>
</field>
<field name="deleteGoogleCheckoutShippingMethod" title="" widget-style="buttontext">
@@ -149,7 +149,7 @@ under the License.
<auto-fields-service service-name="createGoogleCheckoutShippingMethod"/>
<field name="methodTypeEnumId">
<drop-down allow-empty="true">
- <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="GOOGLE_SHIP_TYPE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -166,7 +166,7 @@ under the License.
<field name="carrierPartyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="shipmentMethodTypeId">
<drop-down current="selected" allow-empty="false">
- <entity-options entity-name="ShipmentMethodType" description="${description}"/>
+ <entity-options entity-name="ShipmentMethodType"/>
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
Modified: ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml Sat Jun 20 21:58:05 2015
@@ -49,7 +49,7 @@ under the License.
<auto-fields-service service-name="updateOagisMessageInfo" default-field-type="edit"/>
<field name="processingStatusId">
<drop-down allow-empty="true" >
- <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId"/>
+ <entity-options entity-name="StatusItem" key-field-name="statusId"/>
</drop-down>
</field>
<field name="orderId" >
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml Sat Jun 20 21:58:05 2015
@@ -89,8 +89,8 @@ under the License.
<set field="projectId" from-field="result.projectId"/>
<set field="projectName" from-field="result.projectName"/>
</actions>
- <field name="custRequestTypeId"><display-entity entity-name="CustRequestType" description="${description}"/></field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="custRequestTypeId"><display-entity entity-name="CustRequestType"/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem"/></field>
<field name="fromPartyId">
<display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}" key-field-name="partyId">
<sub-hyperlink target="viewprofile" description="[${fromPartyId}]">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sat Jun 20 21:58:05 2015
@@ -78,7 +78,7 @@
</field>
<field name="scopeEnumId" title="${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}">
<drop-down allow-empty="false" no-current-selected-key="WES_PRIVATE">
- <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -148,7 +148,7 @@
</field>
<field name="hours" position="2"><display/></field>
<field name="timesheetPartyId" position="2"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName}" key-field-name="partyId"/></field>
- <field name="rateTypeId" title="${uiLabelMap.ProjectMgrRateTypeId}" position="2"><display-entity entity-name="RateType" description="${description}"/></field>
+ <field name="rateTypeId" title="${uiLabelMap.ProjectMgrRateTypeId}" position="2"><display-entity entity-name="RateType"/></field>
<field name="fromDate" position="2"><display type="date"/></field>
</form>
<form name="ListProjects" type="list" list-name="listIt" paginate-target="FindProject"
@@ -177,7 +177,7 @@
<parameter param-name="projectId" from-field="resultProject.projectInfo.projectId"/>
</hyperlink>
</field>
- <field name="currentStatusId" map-name="resultProject.projectInfo" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+ <field name="currentStatusId" map-name="resultProject.projectInfo" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="estimatedStartDate" map-name="resultProject.projectInfo" title="${uiLabelMap.FormFieldTitle_estimatedStartDate}"><display type="date"/></field>
<field name="estimatedCompletionDate" map-name="resultProject.projectInfo" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}"><display type="date"/></field>
<field name="actualStartDate" map-name="resultProject.projectInfo" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><display type="date"/></field>
@@ -199,7 +199,7 @@
<parameter param-name="projectId"/>
</hyperlink>
</field>
- <field name="currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+ <field name="currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="estimatedStartDate" title="${uiLabelMap.FormFieldTitle_estimatedStartDate}"><display type="date"/></field>
<field name="estimatedCompletionDate" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}"><display type="date"/></field>
<field name="actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><display type="date"/></field>
@@ -225,7 +225,7 @@
<parameter param-name="projectId" from-field="workEffortId"/>
</hyperlink>
</field>
- <field name="currentStatusId" title="${uiLabelMap.CommonStatus}" parameter-name="dummy"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+ <field name="currentStatusId" title="${uiLabelMap.CommonStatus}" parameter-name="dummy"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="priority" title="${uiLabelMap.CommonPriority}"><display/></field>
<field name="estimatedStartDate"><display type="date"/></field>
<field name="estimatedCompletionDate"><display type="date"/></field>
@@ -240,7 +240,7 @@
header-row-style="header-row" default-table-style="basic-table">
<field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><display/></field>
<field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
- <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+ <display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="priority" title="${uiLabelMap.CommonPriority}"><display/></field>
<field name="parentProjectId" title="${uiLabelMap.ProjectMgrParentProjectName}">
@@ -329,10 +329,10 @@
<text/>
</field>
<field name="workEffortTypeId" title="${uiLabelMap.CommonType}">
- <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" description="${description}" also-hidden="false"/>
+ <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" also-hidden="false"/>
</field>
<field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
- <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}" also-hidden="false"/>
+ <display-entity entity-name="StatusItem" key-field-name="statusId" also-hidden="false"/>
</field>
<field name="plannedHours" parameter-name="estimatedDuration" title="${uiLabelMap.ProjectMgrPlannedHours}"><text size="3"/></field>
<field name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
@@ -419,7 +419,7 @@
<parameter param-name="projectId"/>
</hyperlink>
</field>
- <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+ <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="priority"><display/></field>
<field name="startDate"><display type="date"/></field>
<field name="completionDate"><display type="date"/></field>
@@ -441,7 +441,7 @@
</field>
<field name="phaseName"><display/></field>
<field name="firstResource"><display description="${resources[0].lastName},${resources[0].firstName} ${resources[0].middleName}"/></field>
- <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+ <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="priority" title="${uiLabelMap.ProjectMgrProrityAbbr}"><display/></field>
<field name="startDate"><display type="date"/></field>
<field name="estimatedCompletionDate" title="${uiLabelMap.ProjectMgrEstimatedCompletionDateAbbr}"><display type="date"/></field>
@@ -462,8 +462,8 @@
</hyperlink>
</field>
<field name="orderName"><display/></field>
- <field name="orderTypeId"><display-entity entity-name="OrderType" description="${description}"/></field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="orderTypeId"><display-entity entity-name="OrderType"/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem"/></field>
<field name="orderDate"><display/></field>
<field name="entryDate"><display/></field>
<field name="linkProjectOrder" title=" " widget-style="buttontext" use-when="headerItem.equals("editProjectOrders")">
@@ -520,7 +520,7 @@
<parameter param-name="partyId"/>
</hyperlink>
</field>
- <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
+ <field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date-time"/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date-time"/></field>
<field name="actualHours" entry-name="actualHours" map-name="result.projectInfo"><display/></field>
@@ -534,7 +534,7 @@
<parameter param-name="partyId"/>
</hyperlink>
</field>
- <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
+ <field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date-time"/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date-time"/></field>
</form>
@@ -552,10 +552,10 @@
<parameter param-name="partyId"/>
</hyperlink>
</field>
- <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
+ <field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date-time"/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date-time"/></field>
- <field name="currencyUomId"><display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/></field>
+ <field name="currencyUomId"><display-entity entity-name="Uom" key-field-name="uomId"/></field>
</form>
<form name="EditWorkEffortPartyAssigns" target="deleteWorkEffortPartyAssign" title="" type="list" paginate-target="ListWorkEffortPartyAssigns"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
@@ -642,7 +642,7 @@
</field>
<field entry-name="xx" name="roleTypeId" use-when="workEffortId==projectId && parameters.get("partyId")!=null" title="${uiLabelMap.PartyRoleType}">
<drop-down>
- <entity-options entity-name="PartyRoleDetailAndPartyDetail" description="${description}">
+ <entity-options entity-name="PartyRoleDetailAndPartyDetail">
<entity-constraint name="parentTypeId" value="PROJECT_TEAM"/>
<entity-constraint name="partyId" env-name="parameters.partyId"/>
</entity-options>
@@ -650,7 +650,7 @@
</field>
<field entry-name="xx" name="roleTypeId" use-when="workEffortId!=projectId && parameters.get("partyId")!=null" title="${uiLabelMap.PartyRoleType}">
<drop-down>
- <entity-options entity-name="WorkEffortPartyAssignAndRoleType" description="${description}">
+ <entity-options entity-name="WorkEffortPartyAssignAndRoleType">
<entity-constraint name="workEffortId" env-name="projectId"/>
<entity-constraint name="partyId" env-name="parameters.partyId"/>
</entity-options>
@@ -701,8 +701,8 @@
<parameter param-name="projectId" from-field="resultProject.projectId"/>
</hyperlink>
</field>
- <field entry-name="currentStatusId" name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
- <field entry-name="statusId" name="Status" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+ <field entry-name="currentStatusId" name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+ <field entry-name="statusId" name="Status" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="workEffortId"><hidden value="${workEffortId}"/></field>
<field name="priority" title="${uiLabelMap.CommonPriority}" widget-area-style="centered">
<display description="${priority}"/>
@@ -754,7 +754,7 @@
</hyperlink>
</field>
<field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
- <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+ <display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="priority" widget-area-style="centered"><display description="${Priority}"/></field>
<field name="estimatedStartDate" widget-area-style="centered"><display type="date"/></field>
@@ -784,7 +784,7 @@
<field use-when="project==null" name="currentStatusId"><hidden value="_NA_"/></field>
<field entry-name="test" name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
<drop-down>
- <entity-options entity-name="RoleType" description="${description}">
+ <entity-options entity-name="RoleType">
<entity-constraint name="parentTypeId" value="PROJECT_TEAM"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -812,7 +812,7 @@
</field>
<field entry-name="test" name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
<drop-down>
- <entity-options entity-name="RoleType" description="${description}">
+ <entity-options entity-name="RoleType">
<entity-constraint name="parentTypeId" value="PROJECT_TEAM"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -903,11 +903,11 @@
<lookup target-form-name="LookupTreeContent"/>
</field>
<field name="workEffortContentTypeId" use-when="workEffortContent!=null" map-name="workEffortContent">
- <display-entity entity-name="WorkEffortContentType" description="${description}"/>
+ <display-entity entity-name="WorkEffortContentType"/>
</field>
<field name="workEffortContentTypeId" use-when="workEffortContent==null">
<drop-down allow-empty="false">
- <entity-options description="${description}" entity-name="WorkEffortContentType"/>
+ <entity-options entity-name="WorkEffortContentType"/>
</drop-down>
</field>
<!-- note sure if these two are necessray, but they are kind of confusing in this context:
@@ -916,12 +916,12 @@
-->
<field name="contentTypeId" use-when="workEffortContent!=null">
<drop-down allow-empty="false" no-current-selected-key="DOCUMENT">
- <entity-options description="${description}" entity-name="ContentType"/>
+ <entity-options entity-name="ContentType"/>
</drop-down>
</field>
<!--field name="statusId" use-when="content==null">
<drop-down allow-empty="false" no-current-selected-key="CTNT_AVAILABLE">
- <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" value="CONTENT_STATUS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
@@ -937,7 +937,7 @@
</field-->
<field name="mimeTypeId" >
<drop-down allow-empty="false">
- <entity-options description="${description}" entity-name="MimeType" key-field-name="mimeTypeId"/>
+ <entity-options entity-name="MimeType" key-field-name="mimeTypeId"/>
</drop-down>
</field>
<field name="dataResourceName" use-when="workEffortContent==null" title="${uiLabelMap.CommonUpload}"><file/></field>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml Sat Jun 20 21:58:05 2015
@@ -70,7 +70,7 @@
<field name="PartyId" parameter-name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
<field name="roleTypeId">
<drop-down allow-empty="false">
- <entity-options entity-name="RoleType" description="${description}">
+ <entity-options entity-name="RoleType">
<entity-constraint name="parentTypeId" operator="equals" value="PROJECT_TEAM"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -81,7 +81,7 @@
<form name="AddPartyRole" extends="AddPartyRole" extends-resource="component://party/widget/partymgr/PartyForms.xml">
<field name="roleTypeId">
<drop-down allow-empty="false">
- <entity-options entity-name="RoleType" description="${description}">
+ <entity-options entity-name="RoleType">
<entity-constraint name="parentTypeId" operator="equals" value="PROJECT_TEAM"/>
<entity-order-by field-name="description"/>
</entity-options>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sat Jun 20 21:58:05 2015
@@ -67,7 +67,7 @@
<field name="taskSeqId" entry-name="sequenceNum" parameter-name="sequenceNum" title="${uiLabelMap.FormFieldTitle_sequenceNum}"><text size="3"/></field>
<field name="roleTypeId" use-when="myTask!=void" title="${uiLabelMap.ProjectMgrMyRoleForThisTask}">
<drop-down current="selected" allow-empty="false">
- <entity-options entity-name="ProjectIdPartyRoleAndPhase" description="${description}">
+ <entity-options entity-name="ProjectIdPartyRoleAndPhase">
<entity-constraint name="partyId" operator="equals" env-name="userLogin.partyId"/>
<entity-constraint name="phaseId" operator="equals" env-name="parameters.workEffortParentId"/>
<entity-order-by field-name="description"/>
@@ -77,7 +77,7 @@
<field name="estimatedHours" use-when="myTask!=void" title="${uiLabelMap.ProjectMgrEstimatedHours}"><text size="5"/></field>
<field name="skillTypeId" use-when="myTask!=void" title="${uiLabelMap.HumanResSkillTypeId}">
<drop-down allow-empty="true">
- <entity-options entity-name="SkillType" description="${description}"/>
+ <entity-options entity-name="SkillType"/>
</drop-down>
</field>
<field name="currentStatusId" use-when="task!=null&&task!=void"><hidden/></field>
@@ -104,7 +104,7 @@
<field name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonMax250Chars}"><textarea/></field>
<field name="scopeEnumId" title="${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}">
<drop-down allow-empty="false" no-current-selected-key="WES_PRIVATE">
- <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -158,7 +158,7 @@
<field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}"><text-find ignore-case="true"/></field>
<field name="currentStatusId">
<drop-down allow-empty="true">
- <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" value="PROJECT_TASK_STATUS"/>
<entity-constraint name="statusId" operator="not-equals" value="PTS_CREATED_UA"/>
<entity-constraint name="statusId" operator="not-equals" value="PTS_CREATED_AS"/>
@@ -249,7 +249,7 @@
<parameter param-name="projectId" from-field="resultProject.projectId"/>
</hyperlink>
</field>
- <!--field entry-name="result.taskInfo.currentStatusId" name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field-->
+ <!--field entry-name="result.taskInfo.currentStatusId" name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field-->
<field name="priority"><display/></field>
<field name="estimatedStartDate"><display type="date"/></field>
<field name="estimatedCompletionDate" red-when="before-now"><display type="date"/></field>
@@ -257,7 +257,7 @@
<field name="actualCompletionDate" red-when="before-now"><display type="date"/></field>
<field entry-name="result.taskInfo.plannedHours" name="plannedHours" title="${uiLabelMap.ProjectMgrPlannedHours}"><display/></field>
<field entry-name="result.taskInfo.actualHours" name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
- <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
<field name="partyId" parameter-name="newPartyId">
<drop-down>
<entity-options entity-name="PartyDetailAndWorkEffortAssign" description="${firstName} ${middleName} ${lastName} ${groupName}">
@@ -268,7 +268,7 @@
</field>
<field name="roleTypeId" parameter-name="newRoleTypeId" title="${uiLabelMap.PartyRole}">
<drop-down>
- <entity-options entity-name="RoleType" description="${description}">
+ <entity-options entity-name="RoleType">
<entity-constraint name="parentTypeId" value="PROJECT_TEAM"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -318,7 +318,7 @@
</field>
<field name="roleTypeId">
<drop-down current="selected" allow-empty="false">
- <entity-options entity-name="ProjectIdPartyRoleAndTask" description="${description}">
+ <entity-options entity-name="ProjectIdPartyRoleAndTask">
<entity-constraint name="partyId" operator="equals" env-name="userLogin.partyId"/>
<entity-constraint name="taskId" operator="equals" env-name="parameters.workEffortId"/>
<entity-order-by field-name="description"/>
@@ -344,7 +344,7 @@
</hyperlink>
</field>
<field name="workEffortParentId" entry-name="r.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>
- <field name="currentStatusId" entry-name="r.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+ <field name="currentStatusId" entry-name="r.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="estimatedStartDate" entry-name="r.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
<field name="estimatedCompletionDate" entry-name="r.taskInfo.estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
<field name="actualStartDate" entry-name="r.taskInfo.actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><display type="date"/></field>
@@ -369,7 +369,7 @@
</hyperlink>
</field>
<field name="workEffortParentId" entry-name="r.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>
- <field name="currentStatusId" entry-name="r.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+ <field name="currentStatusId" entry-name="r.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="estimatedStartDate" entry-name="r.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
<field name="estimatedCompletionDate" entry-name="r.taskInfo.estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
<field name="actualStartDate" entry-name="r.taskInfo.actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><display type="date"/></field>
@@ -417,7 +417,7 @@
</sub-hyperlink>
</display-entity>
</field>
- <field name="skillTypeId" title="${uiLabelMap.ProjectMgrSkillType}"><display-entity entity-name="SkillType" description="${description}"/></field>
+ <field name="skillTypeId" title="${uiLabelMap.ProjectMgrSkillType}"><display-entity entity-name="SkillType"/></field>
<field name="estimatedNumPeople" title="${uiLabelMap.ProjectMgrEstimatedNumPeople}"><text/></field>
<field name="estimatedDuration" title="${uiLabelMap.ProjectMgrEstimatedDuration}"><text/></field>
<field name="estimatedCost" title="${uiLabelMap.ProjectMgrEstimatedCost}" widget-style="linktext"><text/></field>
@@ -426,7 +426,7 @@
<form name="AddTaskSkill" type="single" target="createTaskSkillStandard">
<field name="workEffortId"><hidden value="${workEffortId}"/></field>
<field name="skillTypeId"><drop-down>
- <entity-options entity-name="SkillType" description="${description}"/>
+ <entity-options entity-name="SkillType"/>
</drop-down>
</field>
<field name="estimatedNumPeople" title="${uiLabelMap.ProjectMgrEstimatedNumPeople}"><text/></field>
@@ -464,7 +464,7 @@
</field>
<field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
<drop-down no-current-selected-key="STANDARD">
- <entity-options entity-name="RateType" description="${description}">
+ <entity-options entity-name="RateType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -495,7 +495,7 @@
</field>
<field name="roleTypeId" title="${uiLabelMap.ProjectMgrPartyRoleTypeId}">
<drop-down>
- <entity-options entity-name="RoleType" description="${description}">
+ <entity-options entity-name="RoleType">
<entity-constraint name="parentTypeId" value="PROJECT_TEAM"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -503,7 +503,7 @@
</field>
<field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
<drop-down no-current-selected-key="STANDARD">
- <entity-options entity-name="RateType" description="${description}">
+ <entity-options entity-name="RateType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -549,7 +549,7 @@
</hyperlink>
</field>
<field name="taskDescription" title="${uiLabelMap.CommonDescription}"><display/></field>
- <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+ <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="priority" title="${uiLabelMap.CommonPriority}"><display/></field>
<field name="estimatedStartDate"><display type="date"/></field>
<field name="estimatedCompletionDate"><display type="date"/></field>
@@ -601,7 +601,7 @@
<parameter param-name="partyId"/>
</hyperlink>
</field>
- <field name="roleTypeId" title="${uiLabelMap.ProjectMgrPartyRoleTypeId}"><display-entity entity-name="RoleType" description="${description}"/></field>
+ <field name="roleTypeId" title="${uiLabelMap.ProjectMgrPartyRoleTypeId}"><display-entity entity-name="RoleType"/></field>
<field name="plannedHours"><display/></field>
<field name="originalActualHours"><display/></field>
<field name="actualHours"><display/></field>
@@ -621,10 +621,10 @@
<parameter param-name="fromDate"/>
</hyperlink>
</field>
- <field name="contentTypeId"><display-entity entity-name="ContentType" description="${description}"/></field>
- <field name="workEffortContentTypeId"><display-entity entity-name="WorkEffortContentType" description="${description}"/></field>
+ <field name="contentTypeId"><display-entity entity-name="ContentType"/></field>
+ <field name="workEffortContentTypeId"><display-entity entity-name="WorkEffortContentType"/></field>
<field name="fromDate"><display/></field>
- <field name="drMimeTypeId"><display-entity entity-name="MimeType" description="${description}" key-field-name="mimeTypeId"/></field>
+ <field name="drMimeTypeId"><display-entity entity-name="MimeType" key-field-name="mimeTypeId"/></field>
</form>
<form name="ListWorkEffortRequests" type="list"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
@@ -664,7 +664,7 @@
</hyperlink>
</field>
<field name="workEffortParentId" entry-name="result.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>
- <field name="currentStatusId" entry-name="result.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+ <field name="currentStatusId" entry-name="result.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="estimatedStartDate" entry-name="result.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
<field name="estimatedCompletionDate" entry-name="result.taskInfo.estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
<field name="actualStartDate" entry-name="result.taskInfo.actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><display type="date"/></field>
@@ -691,7 +691,7 @@
</hyperlink>
</field>
<field name="workEffortParentId" entry-name="result.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>
- <field name="currentStatusId" entry-name="result.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+ <field name="currentStatusId" entry-name="result.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="estimatedStartDate" entry-name="result.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
<field name="estimatedCompletionDate" entry-name="result.taskInfo.estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
<field name="actualStartDate" entry-name="result.taskInfo.actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><display type="date"/></field>
@@ -729,7 +729,7 @@
</field>
<field name="taskScopeEnumId" parameter-name="scopeEnumId" title="${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}">
<drop-down allow-empty="false" no-current-selected-key="WES_PRIVATE">
- <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+ <entity-options entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE"/>
<entity-order-by field-name="description"/>
</entity-options>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Sat Jun 20 21:58:05 2015
@@ -51,7 +51,7 @@
<field name="checkComplete" title="${uiLabelMap.ProjectMgrCheckComplete}"><check/></field>
<field name="rateTypeId" title="${uiLabelMap.ProjectMgrRateTypeId}">
<drop-down allow-empty="false" no-current-selected-key="${defaultRateTypeId}">
- <entity-options entity-name="RateType" description="${description}"/>
+ <entity-options entity-name="RateType"/>
</drop-down>
</field>
<field name="d0" parameter-name="hoursDay0" title="${uiLabelMap.ProjectMgrMon}"><text size="2"/></field>
@@ -79,7 +79,7 @@
</hyperlink>
</field>
<field name="weekNumber" title="${uiLabelMap.ProjectMgrWeekNumber}"><display/></field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem"/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
<field name="hours"><display/></field>
@@ -108,7 +108,7 @@
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}" position="1">
<drop-down allow-empty="true">
- <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+ <entity-options entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" value="TIMESHEET_STATUS"/>
<entity-order-by field-name="description"/>
</entity-options>
@@ -140,7 +140,7 @@
</field>
<field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"/></field>
<field name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
- <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
<!--field name="comments" title="${uiLabelMap.CommonComments}"><display/></field-->
@@ -184,7 +184,7 @@
<field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
<field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
<drop-down no-current-selected-key="STANDARD">
- <entity-options entity-name="RateType" description="${description}">
+ <entity-options entity-name="RateType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -214,7 +214,7 @@
<field name="partyId" map-name="userLogin"><hidden/></field>
<field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
<drop-down no-current-selected-key="STANDARD" >
- <entity-options entity-name="RateType" description="${description}">
+ <entity-options entity-name="RateType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -250,7 +250,7 @@
<field name="partyId" title="${uiLabelMap.PartyParty}"><lookup size="12" target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
<field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
<drop-down>
- <entity-options entity-name="RateType" description="${description}">
+ <entity-options entity-name="RateType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -296,7 +296,7 @@
</hyperlink>
</field>
<field name="checkComplete" title="${uiLabelMap.ProjectMgrCheckComplete}"><display/></field>
- <field name="rateTypeId" title="${uiLabelMap.ProjectMgrRateTypeId}"><display-entity entity-name="RateType" description="${description}"/></field>
+ <field name="rateTypeId" title="${uiLabelMap.ProjectMgrRateTypeId}"><display-entity entity-name="RateType"/></field>
<field name="d0" parameter-name="hoursDay0" title="${uiLabelMap.ProjectMgrMon}"><display/></field>
<field name="d1" parameter-name="hoursDay1" title="${uiLabelMap.ProjectMgrTue}"><display/></field>
<field name="d2" parameter-name="hoursDay2" title="${uiLabelMap.ProjectMgrWen}"><display/></field>
Modified: ofbiz/trunk/specialpurpose/scrum/widget/CommunicationEventForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/CommunicationEventForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/CommunicationEventForms.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/CommunicationEventForms.xml Sat Jun 20 21:58:05 2015
@@ -66,7 +66,7 @@ under the License.
</hyperlink>
</field>
<field name="statusId">
- <display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/>
+ <display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="partyIdFrom" title="${uiLabelMap.CommonFrom}">
<display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId">
Modified: ofbiz/trunk/specialpurpose/scrum/widget/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/FieldLookupForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/FieldLookupForms.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/FieldLookupForms.xml Sat Jun 20 21:58:05 2015
@@ -28,7 +28,7 @@ under the License.
<field name="description" title="Product Backlog Item"><text-find/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
- <entity-options entity-name="StatusItem" description="${description}">
+ <entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="CUSTREQ_STTS"/>
<entity-order-by field-name="sequenceId"/>
</entity-options>
Modified: ofbiz/trunk/specialpurpose/scrum/widget/MyWorkForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/MyWorkForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/MyWorkForms.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/MyWorkForms.xml Sat Jun 20 21:58:05 2015
@@ -30,7 +30,7 @@
<parameter param-name="timesheetId"/>
</hyperlink>
</field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem"/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
<field name="hours"><display/></field>
@@ -86,7 +86,7 @@
</hyperlink>
</field>
<field name="checkComplete" title="${uiLabelMap.ScrumCheckComplete}"><display/></field>
- <field name="rateTypeId" title="${uiLabelMap.ScrumRateTypeId}"><display-entity entity-name="RateType" description="${description}"/></field>
+ <field name="rateTypeId" title="${uiLabelMap.ScrumRateTypeId}"><display-entity entity-name="RateType"/></field>
<field name="planHours" title="${uiLabelMap.ScrumPlanHours}"><display/></field>
<field name="d0" parameter-name="hoursDay0" title="${uiLabelMap.ScrumMon}"><display/></field>
<field name="d1" parameter-name="hoursDay1" title="${uiLabelMap.ScrumTue}"><display/></field>
@@ -131,7 +131,7 @@
<field name="taskId" title="${uiLabelMap.ScrumTaskName}" parameter-name="workEffortId" encode-output="true">
<drop-down allow-empty="true" current-description="${result.projectId} ${product.productId} - ${result.projectName}${product.internalName} - ${result.sprintName} - ${groovy:result.backlogName.toString().substring(0,Math.min(result.backlogName.toString().length(),30))}[${result.backlogId}] - ${groovy:result.taskName.toString().substring(0,Math.min(result.taskName.toString().length(),30))}[${result.taskId}]">
<list-options key-name="taskId" list-name="taskListDropdown" description="${projectId}${productId} - ${projectName} ${productName} - ${sprintName} - ${groovy: if (description) description.substring(0,Math.min(description.length(),30))} [${custRequestId}] - ${groovy:taskName.substring(0,Math.min(taskName.length(),20))}[${taskId}]"/>
- <entity-options description="${description}" entity-name="EmplLeaveType" key-field-name="leaveTypeId"/>
+ <entity-options entity-name="EmplLeaveType" key-field-name="leaveTypeId"/>
<sub-hyperlink target="taskView" description="${groovy:workEffortId!=void&&!"Totals".equals(workEffortId)?workEffortId:""}" target-window="_blank">
<parameter param-name="taskId" from-field="workEffortId"/>
</sub-hyperlink>
@@ -140,7 +140,7 @@
<field name="checkComplete" title="${uiLabelMap.ScrumCheckComplete}"><check/></field>
<field name="rateTypeId" title="${uiLabelMap.ScrumRateTypeId}">
<drop-down allow-empty="false" no-current-selected-key="${defaultRateTypeId}">
- <entity-options entity-name="RateType" description="${description}"/>
+ <entity-options entity-name="RateType"/>
</drop-down>
</field>
<field name="planHours" title="${uiLabelMap.ScrumPlanHrs}"><text size="2"/></field>