Author: deepak
Date: Sat Aug 27 13:43:34 2016
New Revision: 1758032
URL: http://svn.apache.org/viewvc?rev=1758032&view=rev
Log:
(OFBIZ-7833) Applied patch from jira issue
================================
Redundant options at select filter on find screens
================================
Thanks Deepak N and Renuka for your contribution.
Modified:
ofbiz/trunk/applications/marketing/widget/ReportForms.xml
ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml
ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml
ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml
Modified: ofbiz/trunk/applications/marketing/widget/ReportForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ReportForms.xml?rev=1758032&r1=1758031&r2=1758032&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/ReportForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/ReportForms.xml Sat Aug 27
13:43:34 2016
@@ -32,7 +32,6 @@ under the License.
<field name="trackingCodeId"
title="${uiLabelMap.MarketingTrackingCode}">
<drop-down allow-empty="true">
- <option key="" description="- ${uiLabelMap.CommonAny} -"/>
<entity-options entity-name="TrackingCode"
description="${trackingCodeId}">
</entity-options>
</drop-down>
@@ -54,7 +53,6 @@ under the License.
<field name="marketingCampaignId"
title="${uiLabelMap.MarketingCampaign}">
<drop-down allow-empty="true">
- <option key="" description="- ${uiLabelMap.CommonAny} -"/>
<entity-options entity-name="MarketingCampaign"
description="${campaignName}">
</entity-options>
</drop-down>
@@ -81,7 +79,6 @@ under the License.
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
- <option key="" description="- ${uiLabelMap.CommonSelectAny}
-"/>
<entity-options entity-name="StatusItem"
key-field-name="statusId">
<entity-constraint name="statusTypeId" operator="equals"
value="COM_EVENT_STATUS"/>
</entity-options>
@@ -89,7 +86,6 @@ under the License.
</field>
<field name="roleStatusId"
title="${uiLabelMap.MarketingSegmentGroupSegmentGroupRole}
${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
- <option key="" description="- ${uiLabelMap.CommonSelectAny}
-"/>
<entity-options entity-name="StatusItem"
key-field-name="statusId">
<entity-constraint name="statusTypeId" operator="equals"
value="COM_EVENT_ROL_STATUS"/>
</entity-options>
@@ -113,14 +109,12 @@ under the License.
</field>
<field name="contactListId" title="${uiLabelMap.PartyContactLists}">
<drop-down allow-empty="true">
- <option key="" description="- ${uiLabelMap.CommonAny} -"/>
<entity-options entity-name="ContactList"
description="${contactListName}">
</entity-options>
</drop-down>
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
- <option key="" description="- ${uiLabelMap.CommonSelectAny}
-"/>
<entity-options entity-name="StatusItem"
key-field-name="statusId">
<entity-constraint name="statusTypeId" operator="equals"
value="CONTACTLST_PARTY"/>
</entity-options>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml?rev=1758032&r1=1758031&r2=1758032&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml Sat Aug 27
13:43:34 2016
@@ -169,8 +169,7 @@ under the License.
<form name="PurchasesByOrganizationReport" type="single"
target="PurchasesByOrganizationReport.pdf" title=""
header-row-style="header-row" default-table-style="basic-table"
target-window="_BLANK">
<field name="fromPartyId" title="${uiLabelMap.AccountingFromParty}">
- <drop-down allow-empty="false">
- <option key="" description="- ${uiLabelMap.CommonSelectAny}
-"/>
+ <drop-down allow-empty="true">
<entity-options entity-name="PartyRoleAndPartyDetail"
description="${groupName} ${firstName} ${lastName} [${partyId}]"
key-field-name="partyId">
<entity-constraint name="roleTypeId" operator="equals"
value="SUPPLIER"/>
</entity-options>
Modified: ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml?rev=1758032&r1=1758031&r2=1758032&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/widget/order/OrderForms.xml Sat Aug 27
13:43:34 2016
@@ -46,8 +46,7 @@ under the License.
<form name="NetBeforeOverheadReport" type="single"
target="NetBeforeOverheadReport.pdf" title=""
header-row-style="header-row" default-table-style="basic-table"
target-window="_BLANK">
<field name="productStoreId">
- <drop-down allow-empty="false">
- <option key="" description="- ${uiLabelMap.CommonSelectAny}
-"/>
+ <drop-down allow-empty="true">
<entity-options entity-name="ProductStore"
description="${storeName} [${productStoreId}]">
<entity-order-by field-name="storeName"/>
</entity-options>
@@ -59,8 +58,7 @@ under the License.
<form name="ProductDemandReport" type="single"
target="ProductDemandReport.pdf" title=""
header-row-style="header-row" default-table-style="basic-table"
target-window="_BLANK">
<field name="productStoreId">
- <drop-down allow-empty="false">
- <option key="" description="- ${uiLabelMap.CommonSelectAny}
-"/>
+ <drop-down allow-empty="true">
<entity-options entity-name="ProductStore"
description="${storeName} [${productStoreId}]">
<entity-order-by field-name="storeName"/>
</entity-options>
@@ -76,8 +74,7 @@ under the License.
</form>
<form name="SaleOrdersByChannel" type="single"
target="OrdersByChannel.pdf" target-window="_BLANK">
<field name="SalesChannel" title="${uiLabelMap.OrderSalesChannel}">
- <drop-down allow-empty="false">
- <option key="" description="- ${uiLabelMap.CommonSelectAny}
-"/>
+ <drop-down allow-empty="true">
<entity-options entity-name="Enumeration"
key-field-name="enumId" description="${description}">
<entity-constraint name="enumTypeId" operator="equals"
value="ORDER_SALES_CHANNEL"/>
</entity-options>
Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml?rev=1758032&r1=1758031&r2=1758032&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml Sat Aug 27 13:43:34
2016
@@ -161,8 +161,7 @@ under the License.
<alt-target use-when="ebayConfig != null"
target="updateEbayConfiguration"/>
<field name="productStoreId" use-when="ebayConfig !=
null"><display/></field>
<field name="productStoreId" title="${uiLabelMap.ProductProductStore}"
use-when="ebayConfig == null">
- <drop-down allow-empty="false">
- <option key="" description="- ${uiLabelMap.CommonSelectAny}
-"/>
+ <drop-down allow-empty="true">
<entity-options entity-name="ProductStore"
description="${storeName} [${productStoreId}]">
<entity-order-by field-name="storeName"/>
</entity-options>
@@ -178,8 +177,7 @@ under the License.
<field name="apiServerUrl"><text size="40"/></field>
<field name="customXml"><textarea cols="60" rows="5"/></field>
<field name="websiteId" field-name="webSiteId"
parameter-name="webSiteId" title="${uiLabelMap.ProductWebSite}">
- <drop-down no-current-selected-key="${ebayConfig.webSiteId}">
- <option key="" description="- ${uiLabelMap.CommonSelectAny}
-"/>
+ <drop-down no-current-selected-key="${ebayConfig.webSiteId}"
allow-empty="true">
<entity-options description="${siteName} [${webSiteId}]"
entity-name="WebSite" key-field-name="webSiteId">
<entity-order-by field-name="siteName"/>
</entity-options>
@@ -234,8 +232,7 @@ under the License.
</drop-down>
</field>
<field name="productStoreId">
- <drop-down allow-empty="false">
- <option key="" description="- ${uiLabelMap.CommonSelectAny}
-"/>
+ <drop-down allow-empty="true">
<entity-options entity-name="ProductStore"
description="${storeName} [${productStoreId}]">
<entity-order-by field-name="storeName"/>
</entity-options>
@@ -252,16 +249,14 @@ under the License.
<form name="FindEbayConfig" type="single" target="FindEbayConfigurations">
<field name="productStoreId" title="${uiLabelMap.ProductProductStore}">
- <drop-down>
- <option key="" description="- ${uiLabelMap.CommonSelectAny}
-"/>
+ <drop-down allow-empty="true">
<entity-options entity-name="ProductStore"
description="${storeName} [${productStoreId}]">
<entity-order-by field-name="storeName"/>
</entity-options>
</drop-down>
</field>
<field name="websiteId" field-name="webSiteId"
parameter-name="webSiteId" title="${uiLabelMap.ProductWebSite}">
- <drop-down no-current-selected-key="${parameters.webSiteId}">
- <option key="" description="- ${uiLabelMap.CommonSelectAny}
-"/>
+ <drop-down no-current-selected-key="${parameters.webSiteId}"
allow-empty="true">
<entity-options entity-name="WebSite" description="${siteName}
[${webSiteId}]" key-field-name="webSiteId">
<entity-order-by field-name="siteName"/>
</entity-options>
