Author: erwan
Date: Mon Jan 9 19:16:15 2012
New Revision: 1229304
URL: http://svn.apache.org/viewvc?rev=1229304&view=rev
Log:
Resolving OFBIZ-4498 - Store Facility tab is messed up in admin console
Modified:
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1229304&r1=1229303&r2=1229304&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Mon
Jan 9 19:16:15 2012
@@ -3173,7 +3173,7 @@ under the License.
<view-map name="EditProductStoreFinAccountSettings" type="screen"
page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreFinAccountSettings"/>
<view-map name="EditProductStoreVendorPayments" type="screen"
page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreVendorPayments"/>
<view-map name="EditProductStoreVendorShipments" type="screen"
page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreVendorShipments"/>
- <view-map name="ProductStoreFacilities"
page="component://product/widget/catalog/StoreScreens.xml#ProductStoreFacilities"
type="screen"/>
+ <view-map name="ProductStoreFacilities"
page="component://product/widget/catalog/CommonScreens.xml#ProductStoreFacilities"
type="screen"/>
<view-map name="ListProductStoreFacility"
page="component://product/widget/catalog/StoreScreens.xml#ListProductStoreFacility"
type="screen"/>
<view-map name="ListProductStoreFacilityFormOnly"
page="component://product/widget/catalog/StoreScreens.xml#ListProductStoreFacilityFormOnly"
type="screen"/>
<view-map name="EditProductStoreFacility"
page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreFacility"
type="screen"/>
Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=1229304&r1=1229303&r2=1229304&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Mon Jan
9 19:16:15 2012
@@ -398,4 +398,36 @@ under the License.
</widgets>
</section>
</screen>
+
+ <screen name="ProductStoreFacilities">
+ <section>
+ <actions>
+ <set field="productStoreId"
from-field="parameters.productStoreId"/>
+ <entity-one entity-name="ProductStore"
value-field="productStore"/>
+ <set field="tabButtonItem" value="EditProductStoreFacilities"/>
+ <set field="labelTitleProperty" value="ProductFacility"/>
+ <set field="headerItem" value="store"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator">
+ <decorator-section name="left-column">
+ <include-screen name="leftbar"/>
+ </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <condition><not><if-empty
field="productStore"/></not></condition>
+ <widgets>
+ <container>
+ <include-menu name="ProductStoreTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <include-menu name="ProductStoreSubTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <label
style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${productStore.storeName} [${uiLabelMap.CommonId}:${productStoreId}]
${${extraFunctionName}}</label>
+ </container>
+ <include-portal-page
id="ProductStoreFacility"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=1229304&r1=1229303&r2=1229304&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Mon Jan 9
19:16:15 2012
@@ -554,51 +554,23 @@ under the License.
</screen>
<!-- Assoc with product -->
- <screen name="ProductStoreFacilities">
+ <screen name="ListProductStoreFacility">
<section>
<actions>
<set field="titleProperty"
value="ProductStoreFacilityAssocList"/>
- <set field="headerItem" value="store"/>
<set field="tabButtonItem" value="EditProductStoreFacilities"/>
<set field="productStoreId"
from-field="parameters.productStoreId"/>
+ <set field="portalPageId" value="ProductStoreFacility"/>
</actions>
<widgets>
- <decorator-screen name="CommonProductStoreDecorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <include-portal-page id="ProductStoreFacility"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="ListProductStoreFacility">
- <section>
- <widgets>
+ <container id="ProductStoreFacilityEditArea"/>
<screenlet title="${uiLabelMap.ProductStoreFacilityAssocList}"
navigation-menu-name="ProductStoreFacility">
<include-menu name="ProductStoreFacility"
location="component://product/widget/catalog/CatalogMenus.xml"/>
- <container id="PrdStoreFacilityMgmtArea">
- <decorator-screen name="CommonProductStoreDecorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <include-screen
name="ListProductStoreFacilityFormOnly"/>
- </decorator-section>
- </decorator-screen>
- </container>
+ <include-form name="ListProductStoreFacility"
location="component://product/widget/catalog/StoreForms.xml"/>
</screenlet>
</widgets>
</section>
</screen>
- <screen name="ListProductStoreFacilityFormOnly">
- <section>
- <actions>
- <property-map resource="ProductUiLabels" map-name="uiLabelMap"
global="true"/>
- <property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
- </actions>
- <widgets>
- <container id="ProductStoreFacilityEditArea"/>
- <include-form name="ListProductStoreFacility"
location="component://product/widget/catalog/StoreForms.xml"/>
- </widgets>
- </section>
- </screen>
<screen name="EditProductStoreFacility">
<section>
<condition>
