Author: jacopoc
Date: Tue Jun 9 13:52:30 2009
New Revision: 783000
URL:
http://svn.apache.org/viewvc?rev=783000&view=revLog:
Fix to make the "Clone Layout" button to work again after recent security refactoring.
NB: the error was caused by the wrong way in which the link with parameters (that are now rendered as forms to post the parameters in a secure way) was implemented in the content application: it was a field of a form causing a nested <form> element in html. Unfortunately this pattern is used in other screens in the content application and sooner or later we will have to fix them in a similar way.
Modified:
ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml
Modified: ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml?rev=783000&r1=782999&r2=783000&view=diff==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml Tue Jun 9 13:52:30 2009
@@ -97,11 +97,6 @@
<hyperlink also-hidden="false" description="${uiLabelMap.CommonCreateNew}" target="EditLayoutTemplate?mode=add&contentIdTo=TEMPLATE_MASTER"/>
</field>
-->
- <field name="cloneLayout" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" position="2" >
- <hyperlink also-hidden="false" description="${uiLabelMap.ContentCloneLayout}" target="cloneLayout">
- <parameter param-name="contentId" from-field="currentValue.contentId"/>
- </hyperlink>
- </field>
</form>
<form name="AddLayout" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="createLayoutSubContent" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
Modified: ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml?rev=783000&r1=782999&r2=783000&view=diff==============================================================================
--- ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml Tue Jun 9 13:52:30 2009
@@ -120,6 +120,9 @@
<section>
<widgets>
<include-form name="EditLayout" location="component://content/webapp/content/layout/LayoutForms.xml"/>
+ <link target="cloneLayout" text="${uiLabelMap.ContentCloneLayout}" style="buttontext">
+ <parameter param-name="contentId" from-field="currentValue.contentId"/>
+ </link>
<platform-specific>
<html>
<html-template location="component://content/webapp/content/layout/renderSubContent.ftl"/>
Locked
