Author: mor
Date: Tue Jan 25 15:38:46 2011
New Revision: 1063322
URL: http://svn.apache.org/viewvc?rev=1063322&view=rev
Log:
Merged from trunk r1063316. Log: Missed these changes in my last commit
(r1063227 Parameterized CommonProductDecorator screen location).
Modified:
ofbiz/branches/release10.04/applications/product/widget/catalog/ProductScreens.xml
Modified:
ofbiz/branches/release10.04/applications/product/widget/catalog/ProductScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/widget/catalog/ProductScreens.xml?rev=1063322&r1=1063321&r2=1063322&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/product/widget/catalog/ProductScreens.xml
(original)
+++
ofbiz/branches/release10.04/applications/product/widget/catalog/ProductScreens.xml
Tue Jan 25 15:38:46 2011
@@ -267,7 +267,7 @@ under the License.
</entity-condition>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonProductDecorator"
location="${parameters.productDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleEditProductCategories}">
<include-form name="UpdateProductCategoryMemeber"
location="component://product/widget/catalog/ProductForms.xml"/>
@@ -298,7 +298,7 @@ under the License.
</entity-and>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonProductDecorator"
location="${parameters.productDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleEditProductConfigs}">
<include-form name="UpdateProductConfig"
location="component://product/widget/catalog/ProductForms.xml"/>
@@ -381,7 +381,7 @@ under the License.
<set field="productId" from-field="parameters.productId"/>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonProductDecorator"
location="${parameters.productDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleAddProductAssetUsage}">
<include-form name="addFixedAssetProduct"
location="component://product/widget/catalog/ProductForms.xml"/>
@@ -418,7 +418,7 @@ under the License.
</entity-and>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonProductDecorator"
location="${parameters.productDecoratorLocation}">
<decorator-section name="body">
<!--<include-form name="UpdateProductPrice"
location="component://product/widget/catalog/ProductForms.xml"/>-->
<screenlet title="${uiLabelMap.ProductRoutings}">
@@ -464,7 +464,7 @@ under the License.
</entity-and>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonProductDecorator"
location="${parameters.productDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.FilterProductCosts}">
<include-form name="FilterCostComponents"
location="component://product/widget/catalog/ProductForms.xml"/>
@@ -521,7 +521,7 @@ under the License.
<script
location="component://product/webapp/catalog/WEB-INF/actions/product/QuickAddVariants.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonProductDecorator"
location="${parameters.productDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleEditProductQuickAdmin}">
<platform-specific>
@@ -580,7 +580,7 @@ under the License.
</entity-condition>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonProductDecorator"
location="${parameters.productDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleEditProductFacilities}">
<include-form name="UpdateProductFacilities"
location="component://product/widget/catalog/ProductForms.xml"/>
@@ -639,7 +639,7 @@ under the License.
<get-related value-field="product"
relation-name="ProductKeyword" list="productKeywords"
order-by-list="orderByList"/>
</actions>
<widgets>
- <decorator-screen name="CommonProductDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonProductDecorator"
location="${parameters.productDecoratorLocation}">
<decorator-section name="body">
<container>
<link target="forceIndexProductKeywords"
text="${uiLabelMap.ProductReInduceKeywords}" style="buttontext">
@@ -1089,7 +1089,7 @@ under the License.
<screen name="CreateVirtualWithVariantsForm">
<section>
<widgets>
- <decorator-screen name="CommonProductDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonProductDecorator"
location="${parameters.productDecoratorLocation}">
<decorator-section name="body">
<include-screen
name="CreateVirtualWithVariantsFormInclude"/>
</decorator-section>
