ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bus...@apache.org
Subject svn commit: r1023206 - /ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
Date Sat, 16 Oct 2010 08:04:58 GMT
Author: buscob
Date: Sat Oct 16 08:04:58 2010
New Revision: 1023206

URL: http://svn.apache.org/viewvc?rev=1023206&view=rev
Log:
Introduced the new include-portal-page in the ManagePortalPages screen.
This should be the only change that needs to be reverted if any issue with the new include-portal-page
is raised.
I do not proceed further with the widget introduction into other screens for a while (even
if I have a local copy of the whole OFBiz converted) so that it will be tested more.

Modified:
    ofbiz/trunk/framework/common/widget/PortalPageScreens.xml

Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=1023206&r1=1023205&r2=1023206&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Sat Oct 16 08:04:58 2010
@@ -143,25 +143,10 @@ under the License.
                                 <condition>
                                     <not><if-empty field="portalPage"/></not>
                                 </condition>
-                                <actions>
-                                    <set field="portalPages[]" from-field="portalPage"/>
-                                    <entity-condition entity-name="PortalPageColumn" list="portalPageColumnList">
-                                        <condition-expr field-name="portalPageId" from-field="parameters.portalPageId"/>
-                                        <order-by field-name="columnSeqId"/>
-                                    </entity-condition>
-                                    <entity-condition entity-name="PortalPagePortletView"
list="portalPagePortletViewList">
-                                        <condition-expr field-name="portalPageId" from-field="parameters.portalPageId"/>
-                                        <order-by field-name="+columnSeqId"/>
-                                        <order-by field-name="+sequenceNum"/>
-                                    </entity-condition>
-                                </actions>
                                 <widgets>
                                     <container id="portalContainerId">
                                         <screenlet title="${uiLabelMap.CommonPortalEditPage}:
${portalPage.portalPageName} [${portalPage.portalPageId}]">
-                                            <link target="addPortalPageColumn" style="buttontext"
text="${uiLabelMap.CommonAddColumn}">
-                                                <parameter param-name="portalPageId" from-field="portalPage.portalPageId"/>
-                                            </link>
-                                            <platform-specific><html><html-template
location="component://common/webcommon/portal/editPortalPage.ftl"/></html></platform-specific>
+                                            <include-portal-page id="${portalPage.portalPageId}"
conf-mode="true"/>                                            
                                         </screenlet>
                                     </container>
                                 </widgets>



Mime
View raw message