You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bu...@apache.org on 2010/10/17 09:42:36 UTC
svn commit: r1023430 - in /ofbiz/trunk:
applications/product/widget/catalog/CommonScreens.xml
applications/product/widget/catalog/StoreScreens.xml
framework/webtools/widget/CommonScreens.xml
specialpurpose/myportal/widget/CommonScreens.xml
Author: buscob
Date: Sun Oct 17 07:42:36 2010
New Revision: 1023430
URL: http://svn.apache.org/viewvc?rev=1023430&view=rev
Log:
Removed uiLabelDecorators. This is a pattern that should not be used. It does not really help but creates dependences instead.
Modified:
ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=1023430&r1=1023429&r2=1023430&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Sun Oct 17 07:42:36 2010
@@ -48,28 +48,6 @@ under the License.
</section>
</screen>
- <screen name="uiLabelDecorator">
- <section>
- <condition>
- <if-has-permission permission="CATALOG" action="_VIEW" />
- </condition>
- <actions>
- <!-- base/top/specific map first, then more common map added for shared labels -->
- <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label>
- </fail-widgets>
- </section>
- </screen>
-
<screen name="CommonProductDecorator">
<section>
<actions>
Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=1023430&r1=1023429&r2=1023430&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Sun Oct 17 07:42:36 2010
@@ -619,16 +619,16 @@ under the License.
</screen>
<screen name="EditProductStoreFacility">
<section>
- <condition><if-has-permission permission="CATALOG" action="_ADMIN"/></condition>
+ <condition>
+ <if-has-permission permission="CATALOG" action="_ADMIN"/>
+ </condition>
<actions>
<entity-one entity-name="ProductStoreFacility" value-field="productStoreFacility"/>
+ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
</actions>
<widgets>
- <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <include-form name="EditProductStoreFacility" location="component://product/widget/catalog/StoreForms.xml"/>
- </decorator-section>
- </decorator-screen>
+ <include-form name="EditProductStoreFacility" location="component://product/widget/catalog/StoreForms.xml"/>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.ProductCatalogUpdatePermissionError}</label>
Modified: ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/CommonScreens.xml?rev=1023430&r1=1023429&r2=1023430&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/CommonScreens.xml Sun Oct 17 07:42:36 2010
@@ -284,19 +284,6 @@ under the License.
</section>
</screen>
- <screen name="uiLabelDecorator">
- <section>
- <actions>
- <property-map resource="TemporalExpressionUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="WebtoolsUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <decorator-section-include name="body"/>
- </widgets>
- </section>
- </screen>
-
<screen name="CommonGeoManagementDecorator">
<section>
<actions>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=1023430&r1=1023429&r2=1023430&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Sun Oct 17 07:42:36 2010
@@ -50,26 +50,6 @@ under the License.
</section>
</screen>
- <screen name="uiLabelDecorator">
- <section>
- <actions>
- <property-map resource="MyPortalUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <decorator-section-include name="body"/>
- </widgets>
- </section>
- </screen>
-
<screen name="CommonPartyDecorator">
<section>
<actions>