ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hans...@apache.org
Subject svn commit: r741502 - in /ofbiz/trunk: framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy specialpurpose/myportal/data/MyPortalTypeData.xml specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
Date Fri, 06 Feb 2009 10:19:46 GMT
Author: hansbak
Date: Fri Feb  6 10:19:45 2009
New Revision: 741502

URL: http://svn.apache.org/viewvc?rev=741502&view=rev
Log:
some more fixes and adjustments for the portal page function

Modified:
    ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy
    ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
    ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml

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=741502&r1=741501&r2=741502&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
Fri Feb  6 10:19:45 2009
@@ -33,11 +33,9 @@
     if (UtilValidate.isNotEmpty(userLoginSecurityGroups)) {
         userLoginSecurityGroupId = userLoginSecurityGroups.get(0).get("groupId");
     }
-    
+
     if(!userLoginSecurityGroupId){
         parameters.portalPageId = parameters.parentPortalPageId;
-    }else{
-    	parameters.parentPortalPageId = userLoginSecurityGroupId;
     }
     
     //get the portal page

Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=741502&r1=741501&r2=741502&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Fri Feb  6 10:19:45 2009
@@ -30,7 +30,7 @@
     <!-- no security group -->
     <PortalPage portalPageId="MYPORTAL_NONE" portalPageName="Main" description="The default
OFBiz portal page" ownerUserLoginId="_NA_"/>
     
-    <PortalPage portalPageId="MYPORTAL_EMPLOYEE" portalPageName="Main" description="The
default OFBiz portal page" ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_EMPLOYEE" />
+    <PortalPage portalPageId="MYPORTAL_EMPLOYEE" sequenceNum="00" portalPageName="Main"
description="The default OFBiz portal page" ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_EMPLOYEE"
/>
     <PortalPage portalPageId="MYPORTAL_EMPLOYEE1" sequenceNum="01" portalPageName="My
Profile" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
     <PortalPage portalPageId="MYPORTAL_EMPLOYEE2" sequenceNum="02" portalPageName="My
Communications" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
     <PortalPage portalPageId="MYPORTAL_EMPLOYEE3" sequenceNum="03" portalPageName="Other
Communications" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
@@ -38,10 +38,18 @@
     <PortalPage portalPageId="MYPORTAL_EMPLOYEE5" sequenceNum="05" portalPageName="My
Time Sheets" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
     <PortalPage portalPageId="MYPORTAL_EMPLOYEE6" sequenceNum="06" portalPageName="My
Tasks" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
     
-    <PortalPage portalPageId="MYPORTAL_CUSTOMER" portalPageName="Main" description="The
default OFBiz portal page" ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_CUSTOMER" />
-    <PortalPage portalPageId="MYPORTAL_CUSTOMER1" portalPageName="My Profile" ownerUserLoginId="_NA_"
parentPortalPageId="MYPORTAL_CUSTOMER" />
-    <PortalPage portalPageId="MYPORTAL_CUSTOMER2" portalPageName="Invoices" ownerUserLoginId="_NA_"
parentPortalPageId="MYPORTAL_CUSTOMER" />
-    <PortalPage portalPageId="MYPORTAL_CUSTOMER3" portalPageName="Projects" ownerUserLoginId="_NA_"
parentPortalPageId="MYPORTAL_CUSTOMER" />
+    <PortalPage portalPageId="MYPORTAL_EMPL-NOEML" sequenceNum="00" portalPageName="Main"
description="The default OFBiz portal page" ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_EMPL-NOEML"
/>
+    <PortalPage portalPageId="MYPORTAL_EMPL-NOEML1" sequenceNum="01" portalPageName="My
Profile" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
+    <PortalPage portalPageId="MYPORTAL_EMPL-NOEML2" sequenceNum="02" portalPageName="My
Communications" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
+    <PortalPage portalPageId="MYPORTAL_EMPL-NOEML3" sequenceNum="03" portalPageName="Other
Communications" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
+    <PortalPage portalPageId="MYPORTAL_EMPL-NOEML4" sequenceNum="04" portalPageName="Company
communications" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
+    <PortalPage portalPageId="MYPORTAL_EMPL-NOEML5" sequenceNum="05" portalPageName="My
Time Sheets" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
+    <PortalPage portalPageId="MYPORTAL_EMPL-NOEML6" sequenceNum="06" portalPageName="My
Tasks" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>
+    
+    <PortalPage portalPageId="MYPORTAL_CUSTOMER" sequenceNum="00" portalPageName="Main"
description="The default OFBiz portal page" ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_CUSTOMER"
/>
+    <PortalPage portalPageId="MYPORTAL_CUSTOMER1" sequenceNum="01" portalPageName="My
Profile" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_CUSTOMER" />
+    <PortalPage portalPageId="MYPORTAL_CUSTOMER2" sequenceNum="02" portalPageName="Invoices"
ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_CUSTOMER" />
+    <PortalPage portalPageId="MYPORTAL_CUSTOMER3" sequenceNum="03" portalPageName="Projects"
ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_CUSTOMER" />
     
     <PortalPageColumn portalPageId="MYPORTAL_NONE" columnSeqId="00001" />
     
@@ -54,6 +62,15 @@
     <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE5" columnSeqId="00001" />
     <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE6" columnSeqId="00001" />
     
+    <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML" columnSeqId="00001" />
+    <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML1" columnSeqId="00001" columnWidthPercentage="50"
/>
+    <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML1" columnSeqId="00002" columnWidthPercentage="50"
/>
+    <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML2" columnSeqId="00001" />
+    <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML3" columnSeqId="00001" />
+    <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML4" columnSeqId="00001" />
+    <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML5" columnSeqId="00001" />
+    <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML6" columnSeqId="00001" />
+    
     <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER" columnSeqId="00001" />
     <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER1" columnSeqId="00001" columnWidthPercentage="50"
/>
     <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER1" columnSeqId="00002" columnWidthPercentage="50"
/>
@@ -107,6 +124,25 @@
     <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE5" portalPortletId="mytimesheet"
portletSeqId="00001" columnSeqId="00001" />
     <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE6" portalPortletId="mytasks" portletSeqId="00001"
columnSeqId="00001" />
     
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML" portalPortletId="listrequestlist"
portletSeqId="00001" columnSeqId="00001" />    
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="party" portletSeqId="00001"
columnSeqId="00001" sequenceNum="0" />
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="contact" portletSeqId="00001"
columnSeqId="00001" />
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="LoyaltyPoints"
portletSeqId="00001" columnSeqId="00001" />
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="PaymentMethods"
portletSeqId="00001" columnSeqId="00001" sequenceNum="4" />
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="AvsSettings"
portletSeqId="00001" columnSeqId="00001" />
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="UserLogin"
portletSeqId="00001" columnSeqId="00002" />
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="Attributes"
portletSeqId="00001" columnSeqId="00002" />
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="Visits" portletSeqId="00001"
columnSeqId="00002" />
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="Content" portletSeqId="00001"
columnSeqId="00002" />
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="ShipperAccount"
portletSeqId="00001" columnSeqId="00002" />
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="Notes" portletSeqId="00001"
columnSeqId="00002" />
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1" portalPortletId="MYTASKSPARTY"
portletSeqId="00001" columnSeqId="00002" />
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML2" portalPortletId="mycommunications"
portletSeqId="00001" columnSeqId="00001" />
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML3" portalPortletId="otherCommunications"
portletSeqId="00001" columnSeqId="00001" />
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML4" portalPortletId="mycompanycomms"
portletSeqId="00001" columnSeqId="00001" />
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML5" portalPortletId="mytimesheet"
portletSeqId="00001" columnSeqId="00001" />
+    <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML6" portalPortletId="mytasks" portletSeqId="00001"
columnSeqId="00001" />
+    
     <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests"
portletSeqId="00001" columnSeqId="00001" sequenceNum="0" />
     <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequestsComp"
portletSeqId="00001" columnSeqId="00001" />
     <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListPartyCommEvents"
portletSeqId="00001" columnSeqId="00001" />

Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml?rev=741502&r1=741501&r2=741502&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml Fri Feb  6 10:19:45
2009
@@ -326,6 +326,7 @@
         <check-errors error-list-name="error_list" error-code="resultPage"/>
         
         <!-- set parameter of person to personContext Map -->
+        <set field="personContext.partyId" from-field="parameters.USERNAME"/>
         <set field="personContext.salutation" from-field="parameters.salutation"/>
         <set field="personContext.firstName" from-field="parameters.firstName"/>
         <set field="personContext.middleName" from-field="parameters.middleName"/>



Mime
View raw message