OFBiz › OFBiz - Commits

svn commit: r900156 - in /ofbiz/trunk: applications/accounting/widget/ applications/accounting/widget/ap/ applications/accounting/widget/ar/ applications/marketing/widget/sfa/ applications/order/widget/ordermgr/ applications/party/widget/partymgr/ fram...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

buscob

svn commit: r900156 - in /ofbiz/trunk: applications/accounting/widget/ applications/accounting/widget/ap/ applications/accounting/widget/ar/ applications/marketing/widget/sfa/ applications/order/widget/ordermgr/ applications/party/widget/partymgr/ fram...

Author: buscob
Date: Sun Jan 17 15:15:14 2010
New Revision: 900156

URL: http://svn.apache.org/viewvc?rev=900156&view=rev
Log:
Added a new "PortalPageScreen" common screen. This can be used to include a portalPage wherever needed (showPortalPage.ftl shouldn't be directly used anymore). The screen needs only the portalPageId input parameter.
Used this new "PortalPageScreen" screen in place of all showPortalPage.ftl includes.

Modified:
ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
ofbiz/trunk/framework/common/widget/CommonScreens.xml
ofbiz/trunk/framework/common/widget/PortalPageScreens.xml

Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=900156&r1=900155&r2=900156&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Sun Jan 17 15:15:14 2010
@@ -269,18 +269,7 @@
<widgets>
<decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}">
<decorator-section name="body">
- <section>
- <actions>
- <entity-one entity-name="PortalPage" value-field="portalPage"/>
- <get-related value-field="portalPage" relation-name="PortalPageColumn" list="portalPageColumns"/>
- <entity-and entity-name="PortalPagePortletView" list="portalPagePortlets">
- <field-map field-name="portalPageId" from-field="portalPage.portalPageId"/>
- </entity-and>
- </actions>
- <widgets>
- <platform-specific><html><html-template location="component://common/webcommon/portal/showPortalPage.ftl"/></html></platform-specific>
- </widgets>
- </section>
+ <include-screen name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/>
</decorator-section>
</decorator-screen>
</widgets>

Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=900156&r1=900155&r2=900156&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Sun Jan 17 15:15:14 2010
@@ -50,25 +50,7 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <section>
- <actions>
- <entity-one entity-name="PortalPage" value-field="portalPage"/>
- <entity-and entity-name="PortalPageColumn" list="portalPageColumns">
- <field-map field-name="portalPageId" from-field="parameters.portalPageId"/>
- <order-by field-name="columnSeqId"/>
- </entity-and>
- <entity-and entity-name="PortalPagePortletView" list="portalPagePortlets">
- <field-map field-name="portalPageId" from-field="portalPage.portalPageId"/>
- <order-by field-name="columnSeqId"/>
- <order-by field-name="sequenceNum"/>
- </entity-and>
- </actions>
- <widgets>
- <platform-specific>
- <html><html-template location="component://common/webcommon/portal/showPortalPage.ftl"/></html>
- </platform-specific>
- </widgets>
- </section>
+ <include-screen name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/>
</decorator-section>
</decorator-screen>
</widgets>

Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=900156&r1=900155&r2=900156&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Sun Jan 17 15:15:14 2010
@@ -52,25 +52,7 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <section>
- <actions>
- <entity-one entity-name="PortalPage" value-field="portalPage"/>
- <entity-and entity-name="PortalPageColumn" list="portalPageColumns">
- <field-map field-name="portalPageId" from-field="parameters.portalPageId"/>
- <order-by field-name="columnSeqId"/>
- </entity-and>
- <entity-and entity-name="PortalPagePortletView" list="portalPagePortlets">
- <field-map field-name="portalPageId" from-field="portalPage.portalPageId"/>
- <order-by field-name="columnSeqId"/>
- <order-by field-name="sequenceNum"/>
- </entity-and>
- </actions>
- <widgets>
- <platform-specific>
- <html><html-template location="component://common/webcommon/portal/showPortalPage.ftl"/></html>
- </platform-specific>
- </widgets>
- </section>
+ <include-screen name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/>
</decorator-section>
</decorator-screen>
</widgets>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=900156&r1=900155&r2=900156&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Sun Jan 17 15:15:14 2010
@@ -61,23 +61,7 @@
<include-screen name="leftbar"/>
</decorator-section>
<decorator-section name="body">
- <section>
- <actions>
- <entity-one entity-name="PortalPage" value-field="portalPage"/>
- <entity-and entity-name="PortalPageColumn" list="portalPageColumns">
- <field-map field-name="portalPageId" from-field="parameters.portalPageId"/>
- <order-by field-name="columnSeqId"/>
- </entity-and>
- <entity-and entity-name="PortalPagePortletView" list="portalPagePortlets">
- <field-map field-name="portalPageId" from-field="portalPage.portalPageId"/>
- <order-by field-name="columnSeqId"/>
- <order-by field-name="sequenceNum"/>
- </entity-and>
- </actions>
- <widgets>
- <platform-specific><html><html-template location="component://common/webcommon/portal/showPortalPage.ftl"/></html></platform-specific>
- </widgets>
- </section>
+ <include-screen name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/>
</decorator-section>
</decorator-screen>
</widgets>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=900156&r1=900155&r2=900156&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Sun Jan 17 15:15:14 2010
@@ -42,23 +42,7 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <section>
- <actions>
- <entity-one entity-name="PortalPage" value-field="portalPage"/>
- <entity-and entity-name="PortalPageColumn" list="portalPageColumns">
- <field-map field-name="portalPageId" from-field="parameters.portalPageId"/>
- <order-by field-name="columnSeqId"/>
- </entity-and>
- <entity-and entity-name="PortalPagePortletView" list="portalPagePortlets">
- <field-map field-name="portalPageId" from-field="portalPage.portalPageId"/>
- <order-by field-name="columnSeqId"/>
- <order-by field-name="sequenceNum"/>
- </entity-and>
- </actions>
- <widgets>
- <platform-specific><html><html-template location="component://common/webcommon/portal/showPortalPage.ftl"/></html></platform-specific>
- </widgets>
- </section>
+ <include-screen name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/>
</decorator-section>
</decorator-screen>
</widgets>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml?rev=900156&r1=900155&r2=900156&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml Sun Jan 17 15:15:14 2010
@@ -25,23 +25,12 @@
<section>
<actions>
<set field="headerItem" value="reports"/>
- <entity-one value-field="portalPage" entity-name="PortalPage">
- <field-map field-name="portalPageId" value="OrderReportPage"/>
- </entity-one>
- <entity-and entity-name="PortalPageColumn" list="portalPageColumns">
- <field-map field-name="portalPageId" value="OrderReportPage"/>
- <order-by field-name="columnSeqId"/>
- </entity-and>
- <entity-and entity-name="PortalPagePortletView" list="portalPagePortlets">
- <field-map field-name="portalPageId" value="OrderReportPage"/>
- <order-by field-name="columnSeqId"/>
- <order-by field-name="sequenceNum"/>
- </entity-and>
+ <set field="parameters.portalPageId" value="OrderReportPage"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific><html><html-template location="component://common/webcommon/portal/showPortalPage.ftl"/></html></platform-specific>
+ <include-screen name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/>
</decorator-section>
</decorator-screen>
</widgets>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=900156&r1=900155&r2=900156&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Sun Jan 17 15:15:14 2010
@@ -59,18 +59,7 @@
<screen name="viewprofile">
<section>
<actions>
- <entity-one value-field="portalPage" entity-name="PortalPage">
- <field-map field-name="portalPageId" value="PartyProfile"/>
- </entity-one>
- <entity-and entity-name="PortalPageColumn" list="portalPageColumns">
- <field-map field-name="portalPageId" value="PartyProfile"/>
- <order-by field-name="columnSeqId"/>
- </entity-and>
- <entity-and entity-name="PortalPagePortletView" list="portalPagePortlets">
- <field-map field-name="portalPageId" value="PartyProfile"/>
- <order-by field-name="columnSeqId"/>
- <order-by field-name="sequenceNum"/>
- </entity-and>
+ <set field="parameters.portalPageId" value="PartyProfile"/>
<set field="titleProperty" value="PageTitleViewPartyProfile"/>
<set field="tabButtonItem" value="viewprofile"/>
<set field="headerItem" value="find"/>
@@ -146,7 +135,7 @@
</section>
<section>
<widgets>
- <platform-specific><html><html-template location="component://common/webcommon/portal/showPortalPage.ftl"/></html></platform-specific>
+ <include-screen name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/>
</widgets>
</section>
</widgets>

Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=900156&r1=900155&r2=900156&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Sun Jan 17 15:15:14 2010
@@ -504,4 +504,21 @@
</widgets>
</section>
</screen>
+
+ <screen name="PortalPageScreen">
+ <section>
+ <actions>
+ <entity-one entity-name="PortalPage" value-field="portalPage"/>
+ <get-related value-field="portalPage" relation-name="PortalPageColumn" list="portalPageColumns"/>
+ <entity-and entity-name="PortalPagePortletView" list="portalPagePortlets">
+ <field-map field-name="portalPageId" from-field="portalPage.portalPageId"/>
+ </entity-and>
+ </actions>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://common/webcommon/portal/showPortalPage.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </screen>
</screens>

Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=900156&r1=900155&r2=900156&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Sun Jan 17 15:15:14 2010
@@ -76,21 +76,9 @@
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
- <actions>
- <entity-one entity-name="PortalPage" value-field="portalPage"/>
- <entity-and entity-name="PortalPageColumn" list="portalPageColumns">
- <field-map field-name="portalPageId" from-field="parameters.portalPageId"/>
- <order-by field-name="columnSeqId"/>
- </entity-and>
- <entity-and entity-name="PortalPagePortletView" list="portalPagePortlets">
- <field-map field-name="portalPageId" from-field="portalPage.portalPageId"/>
- <order-by field-name="columnSeqId"/>
- <order-by field-name="sequenceNum"/>
- </entity-and>
- </actions>
<widgets>
<container id="portalContainerId">
- <platform-specific><html><html-template location="component://common/webcommon/portal/showPortalPage.ftl"/></html></platform-specific>
+ <include-screen name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/>
</container>
</widgets>
</section>