This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release18.12 by this push:
     new 3662f40f69 Fixed: Old error in showPortalPage screen (OFBIZ-13059)
3662f40f69 is described below

commit 3662f40f697113a95406b78a6bd8c6380823c2f8
Author: Jacques Le Roux <[email protected]>
AuthorDate: Sun Apr 21 11:33:24 2024 +0200

    Fixed: Old error in showPortalPage screen (OFBIZ-13059)
    
    I spotted this error in demo stable and trunk error.log. It's due to an old
    commit: https://svn.apache.org/repos/asf/ofbiz/trunk@1023286
    
    I tried a bit to understand what's the problem was but as it's a 13,5 years 
old
    bug I eventually decided to simply remove the wrong parts. I'll not 
backport.
---
 framework/common/widget/PortalPageScreens.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/framework/common/widget/PortalPageScreens.xml 
b/framework/common/widget/PortalPageScreens.xml
index 9bdc546248..64339a3551 100644
--- a/framework/common/widget/PortalPageScreens.xml
+++ b/framework/common/widget/PortalPageScreens.xml
@@ -79,7 +79,9 @@ under the License.
                 <decorator-screen name="main-decorator" 
location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <container id="portalContainerId">
-                            <include-portal-page 
id="${parameters.portalPageId}" conf-mode="${parameters.confMode}" 
use-private="${parameters.usePrivate}"/>
+                               <!-- TODO check and if possible fix that
+                             include-portal-page 
id="${parameters.portalPageId}" conf-mode="${parameters.confMode}" 
use-private="${parameters.usePrivate}"/> -->
+                            <include-portal-page 
id="${parameters.portalPageId}"/>
                         </container>
                     </decorator-section>
                 </decorator-screen>
@@ -113,7 +115,7 @@ under the License.
                             </condition>
                             <widgets>
                                 <screenlet 
title="${uiLabelMap.CommonPortalEditPage}: ${portalPage.portalPageName} 
[${portalPage.portalPageId}]">
-                                    <include-portal-page 
id="${portalPage.portalPageId}" conf-mode="true"/>                              
              
+                                    <include-portal-page 
id="${portalPage.portalPageId}" conf-mode="true"/>
                                 </screenlet>
                             </widgets>
                         </section>

Reply via email to