svn commit: r743245 - in /ofbiz/trunk: framework/common/data/ framework/common/script/org/ofbiz/common/ framework/common/webcommon/WEB-INF/actions/includes/ framework/common/widget/ specialpurpose/mypage/

[hansbak-2]

Author: hansbak
Date: Wed Feb 11 06:22:53 2009
New Revision: 743245

URL: http://svn.apache.org/viewvc?rev=743245&view=rev
Log:
The MyPortal component has now at least the functionality of the old mypage component with the portal functions included. Mypage is now taken off the menu and will be removed the coming weeks when no big problems arise

Modified:
    ofbiz/trunk/framework/common/data/PortalSeedData.xml
    ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml
    ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy
    ofbiz/trunk/framework/common/widget/PortalPageForms.xml
    ofbiz/trunk/specialpurpose/mypage/ofbiz-component.xml

Modified: ofbiz/trunk/framework/common/data/PortalSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/PortalSeedData.xml?rev=743245&r1=743244&r2=743245&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/PortalSeedData.xml (original)
+++ ofbiz/trunk/framework/common/data/PortalSeedData.xml Wed Feb 11 06:22:53 2009
@@ -20,7 +20,7 @@
 
 <entity-engine-xml>
     <!-- PortalPortlet Seed Data: system pages -->
-    <PortalPage portalPageId="EXAMPLE" portalPageName="Example Portal Page" description="The default example OFBiz portal page" ownerUserLoginId="_NA_"/>
+    <PortalPage portalPageId="EXAMPLE" portalPageName="Example Portal Page" description="The default example OFBiz portal page" ownerUserLoginId="_NA_" sequenceNum="0"/>
     <PortalPageColumn portalPageId="EXAMPLE" columnSeqId="00001" columnWidthPercentage="50"/>
     <PortalPageColumn portalPageId="EXAMPLE" columnSeqId="00002"/><!-- no width in pixels or percent, use the rest of the space available -->
     
@@ -30,6 +30,6 @@
         screenName="loginPortlet"       screenLocation="component://common/widget/PortletScreens.xml"
         editFormName="LoginPortletEdit" editFormLocation="component://common/widget/PortletEditForms.xml"/>
 
-    <PortalPagePortlet portalPageId="EXAMPLE" portalPortletId="WELCOME" portletSeqId="1" columnSeqId="00001" sequenceNum="1"/>
-    <PortalPagePortlet portalPageId="EXAMPLE" portalPortletId="LOGIN"   portletSeqId="1" columnSeqId="00002" sequenceNum="1"/>
+    <PortalPagePortlet portalPageId="EXAMPLE" portalPortletId="WELCOME" portletSeqId="1" columnSeqId="00001" sequenceNum="0"/>
+    <PortalPagePortlet portalPageId="EXAMPLE" portalPortletId="LOGIN"   portletSeqId="1" columnSeqId="00002" sequenceNum="0"/>
 </entity-engine-xml>

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml?rev=743245&r1=743244&r2=743245&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml Wed Feb 11 06:22:53 2009
@@ -112,6 +112,9 @@
         </if-empty>
         <set-nonpk-fields map="parameters" value-field="newPortalPage"/>
         <set field="newPortalPage.ownerUserLoginId" from-field="parameters.userLogin.userLoginId"/>
+        <if-empty field="parameters.sequenceNum">
+            <make-next-seq-id value-field="newPortalPage" seq-field-name="sequenceNum"/>
+        </if-empty>
         <create-value value-field="newPortalPage"/>  
         <set field="newPortalPageColumn.portalPageId" from-field="newPortalPage.portalPageId"/>
         <call-service service-name="addPortalPageColumn" in-map-name="newPortalPageColumn"/>

Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy?rev=743245&r1=743244&r2=743245&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy Wed Feb 11 06:22:53 2009
@@ -72,5 +72,6 @@
     
     context.portalPages = portalPages;
     context.userLoginSecurityGroupId = userLoginSecurityGroupId;
-    
-}
\ No newline at end of file
+    parameters.parentPortalPageId = parentPortalPageId
+}
+

Modified: ofbiz/trunk/framework/common/widget/PortalPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageForms.xml?rev=743245&r1=743244&r2=743245&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageForms.xml Wed Feb 11 06:22:53 2009
@@ -57,7 +57,7 @@
         <actions>
             <script location="component://common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy"/>
         </actions>
-        <field name="parentPortalPageId"><hidden value="${parameters.portalPageId}"/></field>
+        <field name="parentPortalPageId"><hidden value="${parameters.parentPortalPageId}"/></field>
         <field name="portalPageName" position="1"><text/></field>
         <field name="description" position="2"><text/></field>
         <field name="createButton"><submit button-type="button"/></field>

Modified: ofbiz/trunk/specialpurpose/mypage/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/ofbiz-component.xml?rev=743245&r1=743244&r2=743245&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/ofbiz-component.xml Wed Feb 11 06:22:53 2009
@@ -37,5 +37,5 @@
         server="default-server"
         location="webapp/mypage"
         mount-point="/mypage"
-        app-bar-display="true"/>
+        app-bar-display="false"/>
 </ofbiz-component>