This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new f3e3f8d Improved: List and Grid (OFBIZ-11345) (#394)
f3e3f8d is described below
commit f3e3f8d08beac94114171b317fe89226ac80d2dc
Author: Pierre Smits <pierre.sm...@orrtiz.com>
AuthorDate: Wed Dec 8 09:20:07 2021 +0100
Improved: List and Grid (OFBIZ-11345) (#394)
According to the definition in widget-form.xsd the use of a combination of
a form with type="list" is deprecated in favour of a grid.
Refactor various list forms into grids.
Refactor various list form references in screens.
modified:
StoreScreens.xml: from form ref to grid ref , additional cleanup
StoreForms.xml: from form definition with list ref to grid definition with
list ref, additional clean-up
---
applications/product/widget/catalog/StoreForms.xml | 76 +++++++++++-----------
.../product/widget/catalog/StoreScreens.xml | 40 +++++-------
2 files changed, 56 insertions(+), 60 deletions(-)
diff --git a/applications/product/widget/catalog/StoreForms.xml
b/applications/product/widget/catalog/StoreForms.xml
index d338f28..d9b56d0 100644
--- a/applications/product/widget/catalog/StoreForms.xml
+++ b/applications/product/widget/catalog/StoreForms.xml
@@ -21,7 +21,7 @@ under the License.
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://ofbiz.apache.org/Widget-Form";
xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form
http://ofbiz.apache.org/dtds/widget-form.xsd";>
- <form name="ListProductStore" type="list" list-name="productStores"
+ <grid name="ListProductStore" list-name="productStores"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar" header-row-style="header-row-2">
<actions>
<set field="parameters.sortField"
from-field="parameters.sortField" default-value="storeName"/>
@@ -37,7 +37,7 @@ under the License.
<field name="storeName" title="${uiLabelMap.ProductStoreName}"
sort-field="true"><display/></field>
<field name="title" title="${uiLabelMap.ProductTitle}"
sort-field="true"><display/></field>
<field name="subtitle" title="${uiLabelMap.ProductSubTitle}"
sort-field="true"><display/></field>
- </form>
+ </grid>
<form name="EditProductStore" type="single" target="updateProductStore"
title="" default-map-name="productStore"
header-row-style="header-row" default-table-style="basic-table">
@@ -433,7 +433,7 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="UpdateProductStoreCatalog" type="list"
target="updateProductStoreCatalog" title="" list-name="productStoreCatalogs"
+ <grid name="UpdateProductStoreCatalog" list-name="productStoreCatalogs"
target="updateProductStoreCatalog"
odd-row-style="alternate-row" default-table-style="basic-table"
separate-columns="true">
<auto-fields-service service-name="updateProductStoreCatalog"/>
<field name="prodCatalogId" title="${uiLabelMap.ProductCatalogId}">
@@ -453,8 +453,8 @@ under the License.
<parameter param-name="fromDate"/>
</hyperlink>
</field>
- </form>
- <form name="ListProductStorePromos" type="list"
list-name="productStorePromoAndAppls" target="updateProductStorePromoAppl"
+ </grid>
+ <grid name="ListProductStorePromos" list-name="productStorePromoAndAppls"
target="updateProductStorePromoAppl"
odd-row-style="alternate-row" default-table-style="basic-table"
separate-columns="true">
<field name="productStoreId"><hidden/></field>
<field name="productPromoId" widget-style="buttontext">
@@ -473,7 +473,7 @@ under the License.
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit
button-type="button"/></field>
- </form>
+ </grid>
<form name="CreateProductStorePromo" type="single"
target="createProductStorePromoAppl"
header-row-style="header-row" default-table-style="basic-table">
<field name="productStoreId"><hidden/></field>
@@ -508,7 +508,7 @@ under the License.
<field name="searchButton" title="${uiLabelMap.CommonFind}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListProductStoreRole" type="list" list-name="listIt"
paginate-target="FindProductStoreRoles" default-entity-name="ProductStoreRole"
separate-columns="true"
+ <grid name="ListProductStoreRole" list-name="listIt"
paginate-target="FindProductStoreRoles" default-entity-name="ProductStoreRole"
separate-columns="true"
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">
@@ -546,7 +546,7 @@ under the License.
<parameter param-name="fromDate"/>
</hyperlink>
</field>
- </form>
+ </grid>
<form name="EditProductStoreRole" type="single" target="storeUpdateRole"
default-map-name="productStoreRole"
header-row-style="header-row" default-table-style="basic-table">
@@ -573,7 +573,7 @@ under the License.
</form>
<!-- ProductStoreFacility forms -->
- <form name="ListProductStoreFacility" type="list" list-name="listIt"
target=""
+ <grid name="ListProductStoreFacility" list-name="listIt"
default-table-style="basic-table hover-bar"
odd-row-style="alternate-row">
<actions>
<entity-and entity-name="ProductStoreFacility">
@@ -582,7 +582,6 @@ under the License.
<order-by field-name="fromDate"/>
</entity-and>
</actions>
-
<field name="submitButton" title=" " >
<hyperlink
target="javascript:ajaxUpdateArea('ProductStoreFacilityEditArea',
'editProductStoreFacility',
'productStoreId=${productStoreId}&facilityId=${facilityId}&fromDate=${fromDate}');"
target-type="plain" image-location="/images/mini-edit.png"
image-title="${uiLabelMap.CommonEdit}"/>
@@ -603,7 +602,7 @@ under the License.
target-type="plain" request-confirmation="true"
image-location="/images/mini-trash.png"
image-title="${uiLabelMap.CommonRemove}">
</hyperlink>
</field>
- </form>
+ </grid>
<form name="EditProductStoreFacility" type="single"
focus-field-name="facilityId"
target="addProductStoreFacility" title=""
default-map-name="productStoreFacility" >
@@ -627,7 +626,7 @@ under the License.
</form>
<!-- ProductStoreGroup Forms -->
- <form name="ListParentProductStoreGroup" type="list"
target="EditProductStoreGroup" paginate="false"
+ <grid name="ListParentProductStoreGroup" target="EditProductStoreGroup"
paginate="false"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
<entity-condition entity-name="ProductStoreGroup">
@@ -644,7 +643,7 @@ under the License.
<field name="productStoreGroupTypeId"><display-entity
entity-name="ProductStoreGroupType"/></field>
<field name="description"><display/></field>
<field name="selectButton" title="${uiLabelMap.CommonSelect}"
widget-style="smallSubmit"><submit button-type="button"/></field>
- </form>
+ </grid>
<form name="EditProductStoreGroup" target="updateProductStoreGroup"
type="single" default-map-name="productStoreGroup">
<alt-target use-when="productStoreGroup == null"
target="createProductStoreGroup"/>
<auto-fields-entity entity-name="ProductStoreGroup"/>
@@ -664,7 +663,7 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.Common${groovy:
context.productStoreGroup?'Submit':'Create'}"
widget-style="smallSubmit"><submit/></field>
</form>
- <form name="ListProductStoreGroupAssoc" type="list"
+ <grid name="ListProductStoreGroupAssoc"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
<entity-and entity-name="ProductStoreGroupRollup"
filter-by-date="true">
@@ -688,8 +687,8 @@ under the License.
<parameter param-name="thruDate"
from-field="date:nowTimestamp()"/>
</hyperlink>
</field>
- </form>
- <form name="ListProductStoreAssoc" type="list"
+ </grid>
+ <grid name="ListProductStoreAssoc"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
<entity-and entity-name="ProductStoreGroupAndMember"
filter-by-date="true">
@@ -704,7 +703,7 @@ under the License.
<field name="storeName"><display/></field>
<field name="fromDate"><display type="date"/></field>
<field name="thruDate"><display type="date"/></field>
- </form>
+ </grid>
<form name="AddProductStoreAssoc" type="single"
target="AddProductStoreToGroup">
<field name="productStoreGroupId"><hidden/></field>
<field name="productStoreId">
@@ -720,7 +719,7 @@ under the License.
<parameter param-name="productStoreGroupId"
from-field="productStoreGroup.productStoreGroupId"/>
</on-event-update-area>
</form>
- <form name="ListProductStoreFinAccountSettings" type="list"
target="UpdateProductStoreFinAccountSettings"
list-name="productStoreFinActSettings"
+ <grid name="ListProductStoreFinAccountSettings"
list-name="productStoreFinActSettings"
target="UpdateProductStoreFinAccountSettings"
odd-row-style="alternate-row" default-table-style="basic-table">
<auto-fields-service service-name="updateProductStoreFinActSetting"
default-field-type="display"/>
<field name="productStoreId"><ignored/></field>
@@ -742,7 +741,7 @@ under the License.
<parameter param-name="finAccountTypeId"/>
</hyperlink>
</field>
- </form>
+ </grid>
<form name="EditProductStoreFinAccountSettings" type="single"
target="UpdateProductStoreFinAccountSettings"
default-map-name="finAccountSetting"
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="finAccountSetting==null"
target="CreateProductStoreFinAccountSettings"/>
@@ -788,7 +787,7 @@ under the License.
<field name="fromAddress"
title="${uiLabelMap.CommonFromAddress}"></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="UpdateProductStoreEmail" type="list"
target="updateProductStoreEmail" title="" list-name="productStoreEmailSettings"
+ <grid name="UpdateProductStoreEmail" list-name="productStoreEmailSettings"
target="updateProductStoreEmail"
odd-row-style="alternate-row" default-table-style="basic-table"
separate-columns="true">
<auto-fields-service service-name="updateProductStoreEmailSetting"/>
<field name="productStoreId"><hidden/></field>
@@ -806,7 +805,7 @@ under the License.
<parameter param-name="emailType"/>
</hyperlink>
</field>
- </form>
+ </grid>
<form name="EditProductStorePaymentSetting" type="single"
target="storeUpdatePaySetting" default-map-name="productStorePaymentSetting"
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="productStorePaymentSetting==null"
target="storeCreatePaySetting"/>
@@ -854,7 +853,8 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListProductStorePaymentSettings" type="list"
odd-row-style="alternate-row" default-table-style="basic-table"
paginate-target="EditProductStorePaySetup">
+ <grid name="ListProductStorePaymentSettings"
paginate-target="EditProductStorePaySetup"
+ odd-row-style="alternate-row" default-table-style="basic-table">
<actions>
<entity-and entity-name="ProductStorePaymentSetting">
<field-map field-name="productStoreId"/>
@@ -898,9 +898,9 @@ under the License.
<field name="deleteLink" title=" "
use-when="${groovy:!security.hasEntityPermission("CATALOG",
"_DELETE", session);}">
<display/>
</field>
- </form>
- <form name="ViewProductStoreSegments" target="" title="" type="list"
- odd-row-style="alternate-row" default-table-style="basic-table"
paginate-target="">
+ </grid>
+ <grid name="ViewProductStoreSegments"
+ odd-row-style="alternate-row" default-table-style="basic-table">
<actions>
<entity-and entity-name="SegmentGroup">
<field-map field-name="productStoreId"/>
@@ -918,7 +918,7 @@ under the License.
<parameter param-name="segmentGroupId"/>
</hyperlink>
</field>
- </form>
+ </grid>
<form name="CreateproductStorekeywordOvrdForm" type="single"
target="createProductStoreKeywordOvrd" title=""
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createProductStoreKeywordOvrd"/>
@@ -933,7 +933,7 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="UpdateproductStorekeywordOvrdForm" type="list"
target="updateProductStoreKeywordOvrd" title=""
list-name="productStorekeywordOvrdList"
+ <grid name="UpdateproductStorekeywordOvrdForm"
list-name="productStorekeywordOvrdList" target="updateProductStoreKeywordOvrd"
odd-row-style="alternate-row" default-table-style="basic-table"
separate-columns="true">
<auto-fields-service service-name="updateProductStoreKeywordOvrd"/>
<field name="productStoreId"><hidden/></field>
@@ -955,7 +955,7 @@ under the License.
<parameter param-name="fromDate"/>
</hyperlink>
</field>
- </form>
+ </grid>
<form name="EditProductStoreVendorPayment" type="single"
target="createProductStoreVendorPayment"
header-row-style="header-row" default-table-style="basic-table">
<field name="productStoreId"><hidden/></field>
@@ -974,7 +974,7 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListProductStoreVendorPayments" type="list"
list-name="productStoreVendorPaymentList"
target="deleteProductStoreVendorPayment"
paginate-target="EditProductStoreVendorPayments"
+ <grid name="ListProductStoreVendorPayments"
list-name="productStoreVendorPaymentList"
target="deleteProductStoreVendorPayment"
paginate-target="EditProductStoreVendorPayments"
odd-row-style="alternate-row" default-table-style="basic-table">
<field name="productStoreId"><hidden/></field>
<field name="vendorPartyId"><display/></field>
@@ -985,7 +985,7 @@ under the License.
<display-entity entity-name="Enumeration" key-field-name="enumId"/>
</field>
<field name="submitButton" title="${uiLabelMap.CommonDelete}"
widget-style="smallSubmit"><submit button-type="button"/></field>
- </form>
+ </grid>
<form name="EditProductStoreVendorShipment" type="single"
target="createProductStoreVendorShipment"
header-row-style="header-row" default-table-style="basic-table">
<field name="productStoreId"><hidden/></field>
@@ -998,7 +998,7 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListProductStoreVendorShipments" type="list"
list-name="productStoreVendorShipmentList"
target="deleteProductStoreVendorShipment"
+ <grid name="ListProductStoreVendorShipments"
list-name="productStoreVendorShipmentList"
target="deleteProductStoreVendorShipment"
paginate-target="EditProductStoreVendorShipments"
odd-row-style="alternate-row" default-table-style="basic-table">
<field name="productStoreId"><hidden/></field>
<field name="carrierPartyId"><display/></field>
@@ -1007,9 +1007,9 @@ under the License.
<display-entity entity-name="ShipmentMethodType"
key-field-name="shipmentMethodTypeId"/>
</field>
<field name="submitButton" title="${uiLabelMap.CommonDelete}"
widget-style="smallSubmit"><submit button-type="button"/></field>
- </form>
- <form name="ListShipmentCostEstimates" target="" title="" type="list"
list-name="estimates"
- paginate-target="EditProductStoreShipmentCostEstimates"
odd-row-style="alternate-row" default-table-style="basic-table">
+ </grid>
+ <grid name="ListShipmentCostEstimates" list-name="estimates"
paginate-target="EditProductStoreShipmentCostEstimates"
+ odd-row-style="alternate-row" default-table-style="basic-table">
<auto-fields-entity entity-name="ShipmentCostEstimate"
default-field-type="display"/>
<field name="productStoreId"><hidden/></field>
<field name="carrierRoleTypeId"><hidden/></field>
@@ -1052,7 +1052,7 @@ under the License.
<parameter param-name="shipmentCostEstimateId"/>
</hyperlink>
</field>
- </form>
+ </grid>
<form name="AddShipmentCostEstimate" type="single"
target="storeCreateShipRate" title=""
header-row-style="header-row" default-table-style="basic-table">
<field name="productStoreId"><hidden/></field>
@@ -1201,8 +1201,8 @@ under the License.
</sort-order>
</form>
- <form name="ListProductStoreShipmentMeths" target="" title="" type="list"
list-name="storeShipMethods"
- paginate-target="EditProductStoreShipSetup"
odd-row-style="alternate-row" default-table-style="basic-table">
+ <grid name="ListProductStoreShipmentMeths" list-name="storeShipMethods"
paginate-target="EditProductStoreShipSetup"
+ odd-row-style="alternate-row" default-table-style="basic-table">
<auto-fields-entity entity-name="ProductStoreShipmentMeth"
default-field-type="display"/>
<field name="productStoreId"><hidden/></field>
<field name="productStoreShipMethId" title=" "
widget-style="buttontext">
@@ -1239,7 +1239,7 @@ under the License.
<parameter param-name="productStoreShipMethId"/>
</hyperlink>
</field>
- </form>
+ </grid>
<form name="EditProductStoreShipmentMeth" type="single"
target="storeUpdateShipMeth" title=""
default-map-name="productStoreShipmentMeth"
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="productStoreShipmentMeth==null"
target="storeCreateShipMeth"/>
diff --git a/applications/product/widget/catalog/StoreScreens.xml
b/applications/product/widget/catalog/StoreScreens.xml
index 02e7146..d122efa 100644
--- a/applications/product/widget/catalog/StoreScreens.xml
+++ b/applications/product/widget/catalog/StoreScreens.xml
@@ -32,7 +32,7 @@ under the License.
<decorator-screen name="CommonProductStoreDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.ProductProductStoreList}">
- <include-form name="ListProductStore"
location="component://product/widget/catalog/StoreForms.xml"/>
+ <include-grid name="ListProductStore"
location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -81,7 +81,7 @@ under the License.
<include-form name="FindProductStoreRole"
location="component://product/widget/catalog/StoreForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="ListProductStoreRole"
location="component://product/widget/catalog/StoreForms.xml"/>
+ <include-grid name="ListProductStoreRole"
location="component://product/widget/catalog/StoreForms.xml"/>
</decorator-section>
</decorator-screen>
<screenlet
title="${uiLabelMap.PageTitleEditProductStoreRoles}">
@@ -101,10 +101,8 @@ under the License.
<set field="labelTitleProperty" value="ProductPromotions"/>
<set field="userEntered" from-field="parameters.userEntered"/>
<set field="activeOnly" from-field="parameters.activeOnly"
default-value="true"/>
-
<set field="productStoreId"
from-field="parameters.productStoreId"/>
- <entity-one entity-name="ProductStore"
value-field="productStore" auto-field-map="true"/>
-
+ <entity-one entity-name="ProductStore"
value-field="productStore" auto-field-map="true"/>
<entity-condition entity-name="ProductStorePromoAndAppl"
list="productStorePromoAndAppls" filter-by-date="${activeOnly}">
<condition-list combine="and">
<condition-expr field-name="userEntered"
from-field="userEntered" ignore-if-empty="true"/>
@@ -149,7 +147,7 @@ under the License.
</link>
</container>
<screenlet
title="${uiLabelMap.PageTitleEditProductStorePromos}">
- <include-form name="ListProductStorePromos"
location="component://product/widget/catalog/StoreForms.xml"/>
+ <include-grid name="ListProductStorePromos"
location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.ProductAddStorePromo}">
<include-form name="CreateProductStorePromo"
location="component://product/widget/catalog/StoreForms.xml"/>
@@ -180,7 +178,7 @@ under the License.
<decorator-screen name="CommonProductStoreDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleEditProductStoreCatalogs}">
- <include-form name="UpdateProductStoreCatalog"
location="component://product/widget/catalog/StoreForms.xml"/>
+ <include-grid name="UpdateProductStoreCatalog"
location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.PageTitleAddProductStoreCatalogs}">
<include-form name="CreateProductStoreCatalog"
location="component://product/widget/catalog/StoreForms.xml"/>
@@ -245,7 +243,7 @@ under the License.
<decorator-screen name="CommonProductStoreDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleEditProductStoreShipSetup}">
- <include-form name="ListProductStoreShipmentMeths"
location="component://product/widget/catalog/StoreForms.xml"/>
+ <include-grid name="ListProductStoreShipmentMeths"
location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
<section>
<condition>
@@ -294,7 +292,7 @@ under the License.
<decorator-screen name="CommonProductStoreDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleEditProductStoreShipmentCostEstimates}">
- <include-form name="ListShipmentCostEstimates"
location="component://product/widget/catalog/StoreForms.xml"/>
+ <include-grid name="ListShipmentCostEstimates"
location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
<section>
<condition>
@@ -336,7 +334,7 @@ under the License.
<decorator-screen name="CommonProductStoreDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleListProductStorePaySetup}">
- <include-form
name="ListProductStorePaymentSettings"
location="component://product/widget/catalog/StoreForms.xml"/>
+ <include-grid
name="ListProductStorePaymentSettings"
location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.PageTitleEditProductStorePaySetup}">
<section>
@@ -373,7 +371,7 @@ under the License.
<decorator-screen name="CommonProductStoreDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleEditProductStoreEmailSetup}">
- <include-form name="UpdateProductStoreEmail"
location="component://product/widget/catalog/StoreForms.xml"/>
+ <include-grid name="UpdateProductStoreEmail"
location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.PageTitleAddProductStoreEmailSetup}">
<include-form name="CreateProductStoreEmail"
location="component://product/widget/catalog/StoreForms.xml"/>
@@ -426,7 +424,7 @@ under the License.
<decorator-screen name="CommonProductStoreDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleEditProductStoreKeywordOvrd}">
- <include-form
name="UpdateproductStorekeywordOvrdForm"
location="component://product/widget/catalog/StoreForms.xml"/>
+ <include-grid
name="UpdateproductStorekeywordOvrdForm"
location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.PageTitleAddProductStoreKeywordOvrd}">
<include-form
name="CreateproductStorekeywordOvrdForm"
location="component://product/widget/catalog/StoreForms.xml"/>
@@ -443,9 +441,7 @@ under the License.
<set field="headerItem" value="store"/>
<set field="tabButtonItem" value="ViewProductStoreSegments"/>
<set field="labelTitleProperty" value="ProductSegments"/>
-
<set field="productStoreId"
from-field="parameters.productStoreId"/>
-
<entity-one entity-name="ProductStore"
value-field="productStore">
<field-map field-name="productStoreId"/>
</entity-one>
@@ -459,7 +455,7 @@ under the License.
</link>
</container>
<screenlet
title="${uiLabelMap.PageTitleViewProductStoreSegments}">
- <include-form name="ViewProductStoreSegments"
location="component://product/widget/catalog/StoreForms.xml"/>
+ <include-grid name="ViewProductStoreSegments"
location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -487,7 +483,7 @@ under the License.
<decorator-screen name="CommonProductStoreDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleListProductStoreFinAccountSettings}">
- <include-form
name="ListProductStoreFinAccountSettings"
location="component://product/widget/catalog/StoreForms.xml"/>
+ <include-grid
name="ListProductStoreFinAccountSettings"
location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.PageTitleEditProductStoreFinAccountSettings}">
<include-form
name="EditProductStoreFinAccountSettings"
location="component://product/widget/catalog/StoreForms.xml"/>
@@ -517,7 +513,7 @@ under the License.
<decorator-screen name="CommonProductStoreDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleListProductStoreVendorPayments}">
- <include-form
name="ListProductStoreVendorPayments"
location="component://product/widget/catalog/StoreForms.xml"/>
+ <include-grid
name="ListProductStoreVendorPayments"
location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.PageTitleEditProductStoreVendorPayments}">
<include-form name="EditProductStoreVendorPayment"
location="component://product/widget/catalog/StoreForms.xml"/>
@@ -546,7 +542,7 @@ under the License.
<decorator-screen name="CommonProductStoreDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleListProductStoreVendorShipments}">
- <include-form
name="ListProductStoreVendorShipments"
location="component://product/widget/catalog/StoreForms.xml"/>
+ <include-grid
name="ListProductStoreVendorShipments"
location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.PageTitleEditProductStoreVendorShipments}">
<include-form
name="EditProductStoreVendorShipment"
location="component://product/widget/catalog/StoreForms.xml"/>
@@ -572,7 +568,7 @@ under the License.
<container id="ProductStoreFacilityEditArea"/>
<screenlet title="${uiLabelMap.ProductStoreFacilityAssocList}"
navigation-menu-name="ProductStoreFacility">
<include-menu name="ProductStoreFacility"
location="component://product/widget/catalog/CatalogMenus.xml"/>
- <include-form name="ListProductStoreFacility"
location="component://product/widget/catalog/StoreForms.xml"/>
+ <include-grid name="ListProductStoreFacility"
location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -606,7 +602,7 @@ under the License.
<decorator-screen name="CommonProductStoreGroupDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.ProductParentProductStoreGroupList}">
- <include-form name="ListParentProductStoreGroup"
location="component://product/widget/catalog/StoreForms.xml"/>
+ <include-grid name="ListParentProductStoreGroup"
location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -645,10 +641,10 @@ under the License.
<include-form name="EditProductStoreGroup"
location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.ProductProductStoreGroupRollup}"
id="editProductStoreGroupRollup" name="editProductStoreGroupRollup"
collapsible="true" initially-collapsed="true">
- <include-form name="ListProductStoreGroupAssoc"
location="component://product/widget/catalog/StoreForms.xml"/>
+ <include-grid name="ListProductStoreGroupAssoc"
location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.ProductProductStoreMember}">
- <include-form name="ListProductStoreAssoc"
location="component://product/widget/catalog/StoreForms.xml"/>
+ <include-grid name="ListProductStoreAssoc"
location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.ProductAddToProductStoreGroup}">
<include-form name="AddProductStoreAssoc"
location="component://product/widget/catalog/StoreForms.xml"/>
