You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2010/04/20 15:04:18 UTC
svn commit: r935898 - in /ofbiz/trunk/framework/common:
webcommon/portal/showPortlet.ftl widget/CommonScreens.xml
widget/PortletEditForms.xml
Author: erwan
Date: Tue Apr 20 13:04:17 2010
New Revision: 935898
URL: http://svn.apache.org/viewvc?rev=935898&view=rev
Log:
misc. corrections on portal :
* when editing a portlet, getting the previous values
* displaying portlets with the right order
* portletId was not retrieved in showPortlet
Modified:
ofbiz/trunk/framework/common/webcommon/portal/showPortlet.ftl
ofbiz/trunk/framework/common/widget/CommonScreens.xml
ofbiz/trunk/framework/common/widget/PortletEditForms.xml
Modified: ofbiz/trunk/framework/common/webcommon/portal/showPortlet.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/showPortlet.ftl?rev=935898&r1=935897&r2=935898&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/showPortlet.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/showPortlet.ftl Tue Apr 20 13:04:17 2010
@@ -21,6 +21,7 @@ under the License.
<table width="100%">
<tr><td>
<div>
+ ${setRequestAttribute("portalPortletId", portlet.portalPortletId)}
${screens.render(portlet.screenLocation, portlet.screenName)}
</div>
</td></tr>
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=935898&r1=935897&r2=935898&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Tue Apr 20 13:04:17 2010
@@ -522,11 +522,14 @@ under the License.
<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">
+ <entity-one entity-name="PortalPage" value-field="portalPage" use-cache="true"/>
+ <get-related value-field="portalPage" relation-name="PortalPageColumn"
+ order-by-list="columnSeqId" list="portalPageColumns" use-cache="true"/>
+ <entity-and entity-name="PortalPagePortletView" list="portalPagePortlets" use-cache="true">
<field-map field-name="portalPageId" from-field="portalPage.portalPageId"/>
- </entity-and>
+ <order-by field-name="columnSeqId"/>
+ <order-by field-name="sequenceNum"/>
+ </entity-and>
</actions>
<widgets>
<platform-specific>
Modified: ofbiz/trunk/framework/common/widget/PortletEditForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortletEditForms.xml?rev=935898&r1=935897&r2=935898&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortletEditForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortletEditForms.xml Tue Apr 20 13:04:17 2010
@@ -21,7 +21,7 @@ under the License.
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
- <form name="CommonPortletEdit" type="single" target="setPortalPortletAttributes" title="">
+ <form name="CommonPortletEdit" type="single" target="setPortalPortletAttributes" title="" default-map-name="attributeMap">
<actions>
<service service-name="getPortletAttributes">
<field-map field-name="portalPageId" from-field="parameters.portalPageId"/>
@@ -29,9 +29,9 @@ under the License.
<field-map field-name="portletSeqId" from-field="parameters.portletSeqId"/>
</service>
</actions>
- <field name="portalPageId"><hidden/></field>
- <field name="portalPortletId"><hidden/></field>
- <field name="portletSeqId"><hidden/></field>
+ <field name="portalPageId"><hidden value="${parameters.portalPageId}"/></field>
+ <field name="portalPortletId"><hidden value="${parameters.portalPortletId}"/></field>
+ <field name="portletSeqId"><hidden value="${parameters.portletSeqId}"/></field>
</form>
</forms>