svn commit: r743248 - in /ofbiz/trunk: framework/common/webcommon/portal/editPortalPage.ftl framework/common/widget/PortalPageForms.xml specialpurpose/myportal/templates/appheader.ftl

[hansbak-2]

Author: hansbak
Date: Wed Feb 11 06:45:41 2009
New Revision: 743248

URL: http://svn.apache.org/viewvc?rev=743248&view=rev
Log:
If the portalpage name is deleted the page does not show in the menu. This will enable the possibility to remove system pages

Modified:
    ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
    ofbiz/trunk/framework/common/widget/PortalPageForms.xml
    ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl

Modified: ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl?rev=743248&r1=743247&r2=743248&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl Wed Feb 11 06:45:41 2009
@@ -90,7 +90,7 @@
   
                       <#list portalPages as portalPageList>
                           <#if portalPage.portalPageId != portalPageList.portalPageId>
-                          <option value="<@ofbizUrl>movePortletToPortalPage?${portletUrlLink}&amp;newPortalPageId=${portalPageList.portalPageId}</@ofbizUrl>">${portalPageList.portalPageName}</option>
+                          <option value="<@ofbizUrl>movePortletToPortalPage?${portletUrlLink}&amp;newPortalPageId=${portalPageList.portalPageId}</@ofbizUrl>">${portalPageList.portalPageName?if_exists}</option>
                           </#if>
                       </#list>                          
                     </select>

Modified: ofbiz/trunk/framework/common/widget/PortalPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageForms.xml?rev=743248&r1=743247&r2=743248&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageForms.xml Wed Feb 11 06:45:41 2009
@@ -23,6 +23,9 @@
 
     <form name="ListPortalPages" type="list" list-name="portalPages" paginate-target="ManagePortalPages" separate-columns="true"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
+        <row-actions>
+            <set field="portalPageName" from-field="portalPageName" default-value="???"/>
+        </row-actions>
         <field name="portalPageId" title="${uiLabelMap.CommonEdit}">
             <hyperlink description="${uiLabelMap.CommonEdit}" target="ManagePortalPages?portalPageId=${portalPageId}&amp;parentPortalPageId=${parameters.parentPortalPageId}"/>
         </field>

Modified: ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl?rev=743248&r1=743247&r2=743248&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl (original)
+++ ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl Wed Feb 11 06:45:41 2009
@@ -25,7 +25,9 @@
   <ul>
     <#if portalPages?has_content>
       <#list portalPages as page>
+       <#if page.portalPageName?has_content>
         <li<#if selected = "${page.portalPageId}"> class="selected"</#if>><a href="<@ofbizUrl>showPortalPage?portalPageId=${page.portalPageId}</@ofbizUrl>">${page.portalPageName}</a></li>
+       </#if>
       </#list>
     </#if>
     <li class="opposed"><a href="http://docs.ofbiz.org/display/OFBENDUSER/My+Portal?decorator=printable" url-mode="plain" target-window="new">${uiLabelMap.CommonHelp}</a></li>