svn commit: r1821116 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/content/template/website/WebSiteCMSContent.ftl

Author: jleroux
Date: Sun Jan 14 18:44:38 2018
New Revision: 1821116

URL: http://svn.apache.org/viewvc?rev=1821116&view=rev
Log:
"Applied fix from trunk for revision: 1821115  "
------------------------------------------------------------------------
r1821115 | jleroux | 2018-01-14 19:43:49 +0100 (dim., 14 janv. 2018) | 16 lines

Fixed: Error on updating sub content of CMS webSIte
(OFBIZ-10096)

Steps to reproduce:
Get to
https://demo-trunk.ofbiz.apache.org/content/control/WebSiteCms?webSiteId=CmsSite
4. From WebSIteNav, click on Cms Site Demo Home page
Edit content in editor and click save button (available in editor)
It gives error:
The Following Errors Occurred:
The following required parameter is missing:
  [IN] [updateContentAssoc.contentIdTo]

jleroux: the elrte internal button works but not the widget Save button

Thanks: Aditya
------------------------------------------------------------------------


Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/applications/content/template/website/WebSiteCMSContent.ftl

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 14 18:44:38 2018
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/content/template/website/WebSiteCMSContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/content/template/website/WebSiteCMSContent.ftl?rev=1821116&r1=1821115&r2=1821116&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/content/template/website/WebSiteCMSContent.ftl (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/content/template/website/WebSiteCMSContent.ftl Sun Jan 14 18:44:38 2018
@@ -154,11 +154,14 @@
     <form name="cmsform" enctype="multipart/form-data" method="post" action="<@ofbizUrl>${formAction}</@ofbizUrl>" style="margin: 0;">
         <#if (content?has_content)>
             <input type="hidden" name="dataResourceId" value="${(dataResource.dataResourceId)!}"/>
-            <input type="hidden" name="contentId" value="${content.contentId}"/>
+            <input type="hidden" name="contentIdTo" value="${content.contentId}"/>
 
             <#list requestParameters.keySet() as paramName>
-                <#if (paramName == 'contentIdFrom' || paramName == 'contentAssocTypeId' || paramName == 'fromDate')>
-                    <input type="hidden" name="${paramName}" value="${requestParameters.get(paramName)}"/>
+                <#if paramName == 'contentIdFrom'>
+                  <input type="hidden" name="contentId" value="${requestParameters.get(paramName)}"/>
+                </#if>
+                <#if (paramName == 'contentAssocTypeId' || paramName == 'fromDate')>
+                  <input type="hidden" name="${paramName}" value="${requestParameters.get(paramName)}"/>
                 </#if>
             </#list>
         <#else>