Re: svn commit: r741129 - in /ofbiz/trunk: framework/common/data/ framework/common/entitydef/ framework/common/webcommon/WEB
Locked
Re: svn commit: r741129 - in /ofbiz/trunk: framework/common/data/ framework/common/entitydef/ framework/common/webcommon/WEB
 
|
Hi Hans,
this looks really great! I have tried to create a ne user and then logging in. Really easy! I noticed something: 1) I have created a new user and then when I login I always get the message: "No portal page data found. You may not have the necessary seed or other data for it." 2) I think we should put some configuration to have all the feature you have added enabled/disabled. For instance the captcha, the possibility to create a new user from the login screen etc. Does this make sense? Thank you, Bruno 2009/2/5 <[hidden email]> > > Author: hansbak > Date: Thu Feb 5 15:18:47 2009 > New Revision: 741129 > > URL: http://svn.apache.org/viewvc?rev=741129&view=rev > Log: > the myportal component is functionally complete now having also different page sets for different securitygroups. > > Modified: > ofbiz/trunk/framework/common/data/PortalSeedData.xml > ofbiz/trunk/framework/common/entitydef/entitymodel.xml > ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy > ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy > ofbiz/trunk/framework/common/widget/PortalPageForms.xml > ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml > ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl > ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml > ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml > ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml > > Modified: ofbiz/trunk/framework/common/data/PortalSeedData.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/PortalSeedData.xml?rev=741129&r1=741128&r2=741129&view=diff > ============================================================================== > --- ofbiz/trunk/framework/common/data/PortalSeedData.xml (original) > +++ ofbiz/trunk/framework/common/data/PortalSeedData.xml Thu Feb 5 15:18:47 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_" securityGroupId="FULLADMIN"/> > <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 --> > > > Modified: ofbiz/trunk/framework/common/entitydef/entitymodel.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/entitydef/entitymodel.xml?rev=741129&r1=741128&r2=741129&view=diff > ============================================================================== > --- ofbiz/trunk/framework/common/entitydef/entitymodel.xml (original) > +++ ofbiz/trunk/framework/common/entitydef/entitymodel.xml Thu Feb 5 15:18:47 2009 > @@ -597,10 +597,14 @@ > <field name="originalPortalPageId" type="id"><description>The system portal page this page is derived from</description></field> > <field name="parentPortalPageId" type="id"><description>the parent this page is belonging to, normally the startpage of the portal page group</description></field> > <field name="sequenceNum" type="numeric"></field> > + <field name="securityGroupId" type="id"></field> > <prim-key field="portalPageId"/> > <relation type="one" fk-name="PortPage_PARENT" title="Parent" rel-entity-name="PortalPage"> > <key-map field-name="parentPortalPageId" rel-field-name="portalPageId"/> > </relation> > + <relation type="one" fk-name="PORTPAGE_REL_SECGRP" rel-entity-name="SecurityGroup"> > + <key-map field-name="securityGroupId" rel-field-name="groupId"/> > + </relation> > </entity> > <entity entity-name="PortalPageColumn" package-name="org.ofbiz.common.portal" title="Defines a Portal Page"> > <field name="portalPageId" type="id-ne"></field> > > 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=741129&r1=741128&r2=741129&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 Thu Feb 5 15:18:47 2009 > @@ -22,19 +22,44 @@ > import org.ofbiz.entity.condition.*; > // only execute when a user is logged in > if (parameters.userLogin) { > + // find > + userLoginSecurityGroupId = null; > + condSec = EntityCondition.makeCondition([ > + EntityCondition.makeCondition("groupId", EntityOperator.LIKE, parameters.parentPortalPageId + "%"), > + EntityCondition.makeCondition("userLoginId", EntityOperator.EQUALS, parameters.userLogin.userLoginId) > + ],EntityOperator.AND); > + userLoginSecurityGroups = delegator.findList("UserLoginSecurityGroup", condSec, null, null, null, false); > + > + if (UtilValidate.isNotEmpty(userLoginSecurityGroups)) { > + userLoginSecurityGroupId = userLoginSecurityGroups.get(0).get("groupId"); > + } > + > + //get the portal page > + cond1 = EntityCondition.makeCondition([ > + EntityCondition.makeCondition("portalPageId", EntityOperator.LIKE, parameters.parentPortalPageId + "%"), > + EntityCondition.makeCondition("securityGroupId", EntityOperator.EQUALS, userLoginSecurityGroupId), > + EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, "_NA_"), > + EntityCondition.makeCondition("parentPortalPageId", EntityOperator.EQUALS, null) > + ],EntityOperator.AND); > + portalMainPages = delegator.findList("PortalPage", cond1, null, null, null, false); > + if (portalMainPages) { > + parameters.portalPageId = portalMainPages.get(0).portalPageId; > + } > + > ppCond = > - EntityCondition.makeCondition([ > - EntityCondition.makeCondition([ > - EntityCondition.makeCondition("parentPortalPageId", EntityOperator.EQUALS, parameters.parentPortalPageId), > - EntityCondition.makeCondition("portalPageId", EntityOperator.EQUALS, parameters.parentPortalPageId), > - EntityCondition.makeCondition("originalPortalPageId", EntityOperator.EQUALS, parameters.parentPortalPageId) > - ],EntityOperator.OR), > - EntityCondition.makeCondition([ > - EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, parameters.userLogin.userLoginId), > - EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, "_NA_") > - ],EntityOperator.OR), > - ],EntityOperator.AND); > + EntityCondition.makeCondition([ > + EntityCondition.makeCondition([ > + EntityCondition.makeCondition("parentPortalPageId", EntityOperator.EQUALS, parameters.portalPageId), > + EntityCondition.makeCondition("portalPageId", EntityOperator.EQUALS, parameters.portalPageId), > + EntityCondition.makeCondition("originalPortalPageId", EntityOperator.EQUALS, parameters.portalPageId) > + ],EntityOperator.OR), > + EntityCondition.makeCondition([ > + EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, parameters.userLogin.userLoginId), > + EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, "_NA_") > + ],EntityOperator.OR), > + ],EntityOperator.AND); > portalPages = delegator.findList("PortalPage", ppCond, null, null, null, false); > + > // remove overridden system pages > portalPages.each { portalPage -> > if (portalPage.ownerUserLoginId.equals("_NA_")) { > @@ -44,6 +69,8 @@ > } > } > } > + > context.portalPages = portalPages; > -} > - > + context.userLoginSecurityGroupId = userLoginSecurityGroupId; > + > +} > \ No newline at end of file > > Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy?rev=741129&r1=741128&r2=741129&view=diff > ============================================================================== > --- ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy (original) > +++ ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy Thu Feb 5 15:18:47 2009 > @@ -21,21 +21,55 @@ > import org.ofbiz.base.util.*; > import org.ofbiz.entity.condition.*; > > +portalPage = null; > portalPageId = parameters.portalPageId; > if(!portalPageId){ > portalPageId = parameters.parentPortalPageId; > } > > -portalPage = delegator.findByPrimaryKey("PortalPage", [portalPageId : portalPageId]); > -// check if the user created a private page for a system page > -if (portalPage.ownerUserLoginId.equals("_NA_")) { > - portalPages = delegator.findByAnd("PortalPage", [originalPortalPageId : portalPageId, ownerUserLoginId : parameters.userLogin.userLoginId]); > - if (UtilValidate.isNotEmpty(portalPages)) { > - portalPage = portalPages.get(0); > +if (portalPageId) { > + portalPage = delegator.findByPrimaryKey("PortalPage", [portalPageId : portalPageId]); > +} > + > +if (!portalPage) { > + // find the user private main page > + condPrivat = EntityCondition.makeCondition([ > + EntityCondition.makeCondition("originalPortalPageId", EntityOperator.LIKE, portalPageId + "%"), > + EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, parameters.userLogin.userLoginId) > + ],EntityOperator.AND); > + privatPortalPages = delegator.findList("PortalPage", condPrivat, null, null, null, false); > + > + if (privatPortalPages) { > + portalPage = privatPortalPages.get(0); > + } else { > + // look for system page according the current securitygroup > + //get the security group > + userLoginSecurityGroupId = null; > + condSec = EntityCondition.makeCondition([ > + EntityCondition.makeCondition("groupId", EntityOperator.LIKE, portalPageId + "%"), > + EntityCondition.makeCondition("userLoginId", EntityOperator.EQUALS, parameters.userLogin.userLoginId) > + ],EntityOperator.AND); > + userLoginSecurityGroups = delegator.findList("UserLoginSecurityGroup", condSec, null, null, null, false); > + if (UtilValidate.isNotEmpty(userLoginSecurityGroups)) { > + userLoginSecurityGroupId = userLoginSecurityGroups.get(0).get("groupId"); > + } > + //get the portal page > + cond1 = EntityCondition.makeCondition([ > + EntityCondition.makeCondition("portalPageId", EntityOperator.LIKE, portalPageId + "%"), > + EntityCondition.makeCondition("securityGroupId", EntityOperator.EQUALS, userLoginSecurityGroupId), > + EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, "_NA_"), > + EntityCondition.makeCondition("parentPortalPageId", EntityOperator.EQUALS, null) > + ],EntityOperator.AND); > + portalMainPages = delegator.findList("PortalPage", cond1, null, null, null, false); > + if (portalMainPages) { > + portalPage = portalMainPages.get(0); > + } > } > } > -parameters.portalPageId = portalPage.portalPageId; > -context.portalPage = portalPage; > -context.portalPageColumns = portalPage.getRelated("PortalPageColumn"); > -context.portalPagePortlets = delegator.findByAnd("PortalPagePortletView", [portalPageId : portalPage.portalPageId]); > > +if (portalPage) { > + parameters.portalPageId = portalPage.portalPageId; > + context.portalPage = portalPage; > + context.portalPageColumns = portalPage.getRelated("PortalPageColumn"); > + context.portalPagePortlets = delegator.findByAnd("PortalPagePortletView", [portalPageId : portalPage.portalPageId]); > +} > \ No newline at end of file > > Modified: ofbiz/trunk/framework/common/widget/PortalPageForms.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageForms.xml?rev=741129&r1=741128&r2=741129&view=diff > ============================================================================== > --- ofbiz/trunk/framework/common/widget/PortalPageForms.xml (original) > +++ ofbiz/trunk/framework/common/widget/PortalPageForms.xml Thu Feb 5 15:18:47 2009 > @@ -28,8 +28,8 @@ > </actions> > > <field name="portalPageId" title="${uiLabelMap.CommonId}" sort-field="true"> > - <hyperlink description="${portalPageId}" target="editPortalPage?portalPageId=${portalPageId}&parentPortalPageId=${parameters.parentPortalPageId}"/> > - </field> > + <hyperlink description="${portalPageId}" target="editPortalPage?portalPageId=${portalPageId}&parentPortalPageId=${userLoginSecurityGroupId}"/> > + </field> > <field name="portalPageName" use-when="ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}" sort-field="true"><display/></field> > <field name="portalPageName" use-when="!ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}" id-name="portalPageName" widget-style="tabletext" sort-field="true"> > <display> > @@ -58,7 +58,10 @@ > </form> > > <form name="NewPortalPage" type="single" target="createPortalPage?mainPortalPageId=${parameters.mainPortalPageId}"> > - <field name="parentPortalPageId"><hidden value="${parameters.parentPortalPageId}"/></field> > + <actions> > + <script location="component://common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy"/> > + </actions> > + <field name="parentPortalPageId"><hidden value="${userLoginSecurityGroupId}"/></field> > <field name="portalPageName" parameter-name="portalPageName"><text/></field> > <field name="description"><text/></field> > <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field> > > Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=741129&r1=741128&r2=741129&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original) > +++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Thu Feb 5 15:18:47 2009 > @@ -26,37 +26,56 @@ > <Enumeration description="Customer Request Created" enumCode="CUST_CREATED" enumId="PRDS_CUST_CREATED" sequenceId="17" enumTypeId="PRDS_EMAIL"/> > <Enumeration description="Customer Request Completed" enumCode="CUST_COMPLETE" enumId="PRDS_CUST_CONFIRM" sequenceId="18" enumTypeId="PRDS_EMAIL"/> > > - <!-- PortalPortlet Demo Data --> > - <PortalPage portalPageId="MYPORTAL" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="_NA_" /> > - <PortalPage portalPageId="00001" portalPageName="My Profile" ownerUserLoginId="admin" parentPortalPageId="MYPORTAL" /> > - <PortalPage portalPageId="00002" portalPageName="My Communications" ownerUserLoginId="admin" parentPortalPageId="MYPORTAL" /> > - <PortalPage portalPageId="00003" portalPageName="Other Communications" ownerUserLoginId="admin" parentPortalPageId="MYPORTAL" /> > - <PortalPage portalPageId="00004" portalPageName="Company communications" ownerUserLoginId="admin" parentPortalPageId="MYPORTAL" /> > - <PortalPage portalPageId="00005" portalPageName="My Time Sheets" ownerUserLoginId="admin" parentPortalPageId="MYPORTAL" /> > - <PortalPage portalPageId="00006" portalPageName="My Tasks" ownerUserLoginId="admin" parentPortalPageId="MYPORTAL" /> > - <PortalPage portalPageId="00007" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="DemoEmployee" originalPortalPageId="MYPORTAL" /> > - <PortalPage portalPageId="00008" portalPageName="My Profile" ownerUserLoginId="DemoEmployee" parentPortalPageId="MYPORTAL" /> > - <PortalPage portalPageId="00009" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="DemoCustomer" originalPortalPageId="MYPORTAL" /> > - <PortalPage portalPageId="00010" portalPageName="My Profile" ownerUserLoginId="DemoCustomer" parentPortalPageId="MYPORTAL" /> > - <PortalPage portalPageId="00011" portalPageName="Invoices" ownerUserLoginId="DemoCustomer" parentPortalPageId="MYPORTAL" /> > - <PortalPage portalPageId="00012" portalPageName="Projects" ownerUserLoginId="DemoCustomer" parentPortalPageId="MYPORTAL" /> > - > - <PortalPageColumn portalPageId="MYPORTAL" columnSeqId="00001" /> > - <PortalPageColumn portalPageId="00001" columnSeqId="00001" columnWidthPercentage="50" /> > - <PortalPageColumn portalPageId="00001" columnSeqId="00002" columnWidthPercentage="50" /> > - <PortalPageColumn portalPageId="00002" columnSeqId="00001" /> > - <PortalPageColumn portalPageId="00003" columnSeqId="00001" /> > - <PortalPageColumn portalPageId="00004" columnSeqId="00001" /> > - <PortalPageColumn portalPageId="00005" columnSeqId="00001" /> > - <PortalPageColumn portalPageId="00006" columnSeqId="00001" /> > - <PortalPageColumn portalPageId="00007" columnSeqId="00001" /> > - <PortalPageColumn portalPageId="00008" columnSeqId="00001" columnWidthPercentage="50" /> > - <PortalPageColumn portalPageId="00008" columnSeqId="00002" columnWidthPercentage="50" /> > - <PortalPageColumn portalPageId="00009" columnSeqId="00001" /> > - <PortalPageColumn portalPageId="00010" columnSeqId="00001" columnWidthPercentage="50" /> > - <PortalPageColumn portalPageId="00011" columnSeqId="00001" /> > - <PortalPageColumn portalPageId="00012" columnSeqId="00001" /> > - <PortalPageColumn portalPageId="00010" columnSeqId="00002" columnWidthPercentage="50" /> > + <!-- PortalPortlet System provided pages --> > + <!-- no security group --> > + <PortalPage portalPageId="MYPORTAL_NONE" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="_NA_"/> > + > + <PortalPage portalPageId="MYPORTAL_ADMIN" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="_NA_" securityGroupId="FULLADMIN"/> > + <PortalPage portalPageId="MYPORTAL_ADMIN1" sequenceNum="01" portalPageName="My Profile" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_ADMIN"/> > + <PortalPage portalPageId="MYPORTAL_ADMIN2" sequenceNum="02" portalPageName="My Communications" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_ADMIN"/> > + <PortalPage portalPageId="MYPORTAL_ADMIN3" sequenceNum="03" portalPageName="Other Communications" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_ADMIN"/> > + <PortalPage portalPageId="MYPORTAL_ADMIN4" sequenceNum="04" portalPageName="Company communications" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_ADMIN"/> > + <PortalPage portalPageId="MYPORTAL_ADMIN5" sequenceNum="05" portalPageName="My Time Sheets" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_ADMIN"/> > + <PortalPage portalPageId="MYPORTAL_ADMIN6" sequenceNum="06" portalPageName="My Tasks" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_ADMIN"/> > + > + <PortalPage portalPageId="MYPORTAL_EMPLOYEE" 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"/> > + <PortalPage portalPageId="MYPORTAL_EMPLOYEE4" sequenceNum="04" portalPageName="Company communications" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/> > + <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" /> > + > + <PortalPageColumn portalPageId="MYPORTAL_NONE" columnSeqId="00001" /> > + > + <PortalPageColumn portalPageId="MYPORTAL_ADMIN" columnSeqId="00001" /> > + <PortalPageColumn portalPageId="MYPORTAL_ADMIN1" columnSeqId="00001" columnWidthPercentage="50" /> > + <PortalPageColumn portalPageId="MYPORTAL_ADMIN1" columnSeqId="00002" columnWidthPercentage="50" /> > + <PortalPageColumn portalPageId="MYPORTAL_ADMIN2" columnSeqId="00001" /> > + <PortalPageColumn portalPageId="MYPORTAL_ADMIN3" columnSeqId="00001" /> > + <PortalPageColumn portalPageId="MYPORTAL_ADMIN4" columnSeqId="00001" /> > + <PortalPageColumn portalPageId="MYPORTAL_ADMIN5" columnSeqId="00001" /> > + <PortalPageColumn portalPageId="MYPORTAL_ADMIN6" columnSeqId="00001" /> > + > + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE" columnSeqId="00001" /> > + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE1" columnSeqId="00001" columnWidthPercentage="50" /> > + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE1" columnSeqId="00002" columnWidthPercentage="50" /> > + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE2" columnSeqId="00001" /> > + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE3" columnSeqId="00001" /> > + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE4" columnSeqId="00001" /> > + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE5" columnSeqId="00001" /> > + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE6" columnSeqId="00001" /> > + > + <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER" columnSeqId="00001" /> > + <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER1" columnSeqId="00001" columnWidthPercentage="50" /> > + <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER1" columnSeqId="00002" columnWidthPercentage="50" /> > + <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER2" columnSeqId="00001" /> > + <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER3" columnSeqId="00001" /> > > <PortalPortlet portalPortletId="Attributes" portletName="Attributes" screenName="Attributes" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Attributes in myportal from party" /> > <PortalPortlet portalPortletId="AvsSettings" portletName="Avs Settings" screenName="AvsSettings" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Avs Settings in myportal from party" /> > @@ -84,55 +103,62 @@ > <PortalPortlet portalPortletId="WELCOME" portletName="Welcome" screenName="welcomePortlet" screenLocation="component://common/widget/PortletScreens.xml" description="OFBiz Welcome Message" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" /> > <PortalPortlet portalPortletId="LOGIN" portletName="Login" screenName="loginPortlet" screenLocation="component://common/widget/PortletScreens.xml" editFormName="LoginPortletEdit" editFormLocation="component://common/widget/PortletEditForms.xml" description="Login Form" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" /> > > - <PortalPagePortlet portalPageId="MYPORTAL" portalPortletId="listrequestlist" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00001" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> > - <PortalPagePortlet portalPageId="00001" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00001" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00001" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" sequenceNum="4" /> > - <PortalPagePortlet portalPageId="00001" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00001" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" /> > - <PortalPagePortlet portalPageId="00001" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" /> > - <PortalPagePortlet portalPageId="00001" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" /> > - <PortalPagePortlet portalPageId="00001" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" /> > - <PortalPagePortlet portalPageId="00001" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002" /> > - <PortalPagePortlet portalPageId="00001" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" /> > - <PortalPagePortlet portalPageId="00001" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" /> > - <PortalPagePortlet portalPageId="00002" portalPortletId="mycommunications" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00003" portalPortletId="otherCommunications" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00004" portalPortletId="mycompanycomms" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00005" portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00006" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00007" portalPortletId="mycommunications" portletSeqId="00001" columnSeqId="00001" sequenceNum="-1" /> > - <PortalPagePortlet portalPageId="00007" portalPortletId="mycompanycomms" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> > - <PortalPagePortlet portalPageId="00007" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> > - <PortalPagePortlet portalPageId="00007" portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001" sequenceNum="5" /> > - <PortalPagePortlet portalPageId="00008" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00008" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00008" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00008" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00008" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00008" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" /> > - <PortalPagePortlet portalPageId="00008" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" /> > - <PortalPagePortlet portalPageId="00008" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002" /> > - <PortalPagePortlet portalPageId="00008" portalPortletId="Content" portletSeqId="00002" columnSeqId="00002" /> > - <PortalPagePortlet portalPageId="00008" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" /> > - <PortalPagePortlet portalPageId="00008" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" /> > - <PortalPagePortlet portalPageId="00008" portalPortletId="UserLogin" portletSeqId="00002" columnSeqId="00002" sequenceNum="0" /> > - <PortalPagePortlet portalPageId="00009" portalPortletId="ListCustRequests" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> > - <PortalPagePortlet portalPageId="00009" portalPortletId="ListCustRequestsComp" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00009" portalPortletId="ListPartyCommEvents" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00010" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00010" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00010" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00010" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00010" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00010" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" sequenceNum="0" /> > - <PortalPagePortlet portalPageId="00010" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" /> > - <PortalPagePortlet portalPageId="00010" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" /> > - <PortalPagePortlet portalPageId="00010" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" /> > - <PortalPagePortlet portalPageId="00010" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002" /> > - <PortalPagePortlet portalPageId="00010" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" /> > - <PortalPagePortlet portalPageId="00010" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" /> > - <PortalPagePortlet portalPageId="00011" portalPortletId="ListInvoices" portletSeqId="00001" columnSeqId="00001" /> > - <PortalPagePortlet portalPageId="00012" portalPortletId="ListProjects" portletSeqId="00001" columnSeqId="00001" /> > -</entity-engine-xml> > + <PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> > + > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN" portalPortletId="listrequestlist" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" sequenceNum="4" /> > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" /> > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" /> > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" /> > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" /> > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002" /> > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" /> > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" /> > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN2" portalPortletId="mycommunications" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN3" portalPortletId="otherCommunications" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN4" portalPortletId="mycompanycomms" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN5" portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN6" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" /> > + > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE" portalPortletId="listrequestlist" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" sequenceNum="4" /> > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" /> > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" /> > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" /> > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" /> > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002" /> > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" /> > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" /> > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE2" portalPortletId="mycommunications" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE3" portalPortletId="otherCommunications" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE4" portalPortletId="mycompanycomms" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE5" portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE6" 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" /> > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" sequenceNum="0" /> > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" /> > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" /> > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" /> > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002" /> > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" /> > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" /> > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER2" portalPortletId="ListInvoices" portletSeqId="00001" columnSeqId="00001" /> > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER3" portalPortletId="ListProjects" portletSeqId="00001" columnSeqId="00001" /> > + > +</entity-engine-xml> > \ No newline at end of file > > Modified: ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl?rev=741129&r1=741128&r2=741129&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl (original) > +++ ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl Thu Feb 5 15:18:47 2009 > @@ -29,7 +29,7 @@ > </#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> > - <li class="opposed"><a href="<@ofbizUrl>ManagePortalPages?parentPortalPageId=MYPORTAL</@ofbizUrl>">${uiLabelMap.CommonPreferences}</a></li> > + <li class="opposed"><a href="<@ofbizUrl>ManagePortalPages?parentPortalPageId=${userLoginSecurityGroupId?if_exists}</@ofbizUrl>">${uiLabelMap.CommonPreferences}</a></li> > </ul> > </li> > </ul> > > Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=741129&r1=741128&r2=741129&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original) > +++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Thu Feb 5 15:18:47 2009 > @@ -47,7 +47,7 @@ > <!--set field="applicationMenuName" value="ExampleAppBar" global="true"/> > <set field="applicationMenuLocation" value="component://example/widget/example/ExampleMenus.xml" global="true"/--> > <set field="appheaderTemplate" value="component://myportal/templates/appheader.ftl"/> > - <set field="parameters.parentPortalPageId" value="MYPORTAL" global="true"/> > + <set field="parameters.parentPortalPageId" value="MYPORTAL"/> > <set field="parameters.userLogin.userLoginId" from-field="userLogin.userLoginId"/> > <script location="component://common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy"/> > <entity-one entity-name="PartyNameView" value-field="partyNameView"> > @@ -159,13 +159,6 @@ > <set field="parameters.portalPageId" value="MYPORTAL"/> > <script location="component://common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy"/> > <set field="headerItem" from-field="parameters.portalPageId"/> > - <!--My Profile From Party--> > - <set field="titleProperty" value="PageTitleViewPartyProfile"/> > - <set field="tabButtonItem" value="viewprofile"/> > - <set field="labelTitleProperty" value="PartyTaxAuthInfos"/> > - <set field="parameters.partyId" from-field="userLogin.userLoginId"/> > - <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/> > - <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/> > </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > > Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=741129&r1=741128&r2=741129&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original) > +++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Thu Feb 5 15:18:47 2009 > @@ -166,11 +166,11 @@ > </drop-down> > </field> > <field name="updateButton" widget-style="smallSubmit"><submit /></field> > - <field name="currentStatusId" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field> > - <field name="estimatedStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskPlanStartDate}"><display type="date"/></field> > - <field name="estimatedCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskPlanEndDate}"><display type="date"/></field> > - <field name="actualStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskActStartDate}"><display type="date"/></field> > - <field name="actualCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskActEndDate}"><display type="date"/></field> > + <field name="currentStatusId" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field> > + <field name="estimatedStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskPlanStartDate}"><display type="date"/></field> > + <field name="estimatedCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskPlanEndDate}"><display type="date"/></field> > + <field name="actualStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskActStartDate}"><display type="date"/></field> > + <field name="actualCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskActEndDate}"><display type="date"/></field> > <field name="plannedHours" map-name="taskResult.taskInfo"><display/></field> > <field name="actualHours" map-name="taskResult.taskInfo"><display/></field> > </form> > > Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=741129&r1=741128&r2=741129&view=diff > ============================================================================== > --- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original) > +++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Thu Feb 5 15:18:47 2009 > @@ -787,7 +787,7 @@ > <widgets> > <section> > <condition> > - <not><if-empty field="custRequests"/></not> > + <!--not><if-empty field="custRequests"/></not--> > </condition> > <widgets> > <screenlet title="${uiLabelMap.MyPortalIncomingCustRequests}" navigation-form-name="ListRequestList"> > > |
Re: svn commit: r741129 - in /ofbiz/trunk: framework/common/data/ framework/common/entitydef/ framework/common/webcommon/WEB
|
|
Hi Bruno,
we thought about moving the myportal login screen into the framework...but then we get the problem with the partyId again..... A new registration not entering a name and email address is a bit useless.... this looks again something for the "commonext" component? concerning the new user...we will fix that..... Regards, Hans On Thu, 2009-02-05 at 20:00 +0100, Bruno Busco wrote: > Hi Hans, > this looks really great! > I have tried to create a ne user and then logging in. Really easy! > > I noticed something: > 1) I have created a new user and then when I login I always get the message: > "No portal page data found. You may not have the necessary seed or > other data for it." > > 2) I think we should put some configuration to have all the feature > you have added enabled/disabled. For instance the captcha, the > possibility to create a new user from the login screen etc. Does this > make sense? > > Thank you, > Bruno > > 2009/2/5 <[hidden email]> > > > > Author: hansbak > > Date: Thu Feb 5 15:18:47 2009 > > New Revision: 741129 > > > > URL: http://svn.apache.org/viewvc?rev=741129&view=rev > > Log: > > the myportal component is functionally complete now having also different page sets for different securitygroups. > > > > Modified: > > ofbiz/trunk/framework/common/data/PortalSeedData.xml > > ofbiz/trunk/framework/common/entitydef/entitymodel.xml > > ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy > > ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy > > ofbiz/trunk/framework/common/widget/PortalPageForms.xml > > ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml > > ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl > > ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml > > ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml > > ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml > > > > Modified: ofbiz/trunk/framework/common/data/PortalSeedData.xml > > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/PortalSeedData.xml?rev=741129&r1=741128&r2=741129&view=diff > > ============================================================================== > > --- ofbiz/trunk/framework/common/data/PortalSeedData.xml (original) > > +++ ofbiz/trunk/framework/common/data/PortalSeedData.xml Thu Feb 5 15:18:47 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_" securityGroupId="FULLADMIN"/> > > <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 --> > > > > > > Modified: ofbiz/trunk/framework/common/entitydef/entitymodel.xml > > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/entitydef/entitymodel.xml?rev=741129&r1=741128&r2=741129&view=diff > > ============================================================================== > > --- ofbiz/trunk/framework/common/entitydef/entitymodel.xml (original) > > +++ ofbiz/trunk/framework/common/entitydef/entitymodel.xml Thu Feb 5 15:18:47 2009 > > @@ -597,10 +597,14 @@ > > <field name="originalPortalPageId" type="id"><description>The system portal page this page is derived from</description></field> > > <field name="parentPortalPageId" type="id"><description>the parent this page is belonging to, normally the startpage of the portal page group</description></field> > > <field name="sequenceNum" type="numeric"></field> > > + <field name="securityGroupId" type="id"></field> > > <prim-key field="portalPageId"/> > > <relation type="one" fk-name="PortPage_PARENT" title="Parent" rel-entity-name="PortalPage"> > > <key-map field-name="parentPortalPageId" rel-field-name="portalPageId"/> > > </relation> > > + <relation type="one" fk-name="PORTPAGE_REL_SECGRP" rel-entity-name="SecurityGroup"> > > + <key-map field-name="securityGroupId" rel-field-name="groupId"/> > > + </relation> > > </entity> > > <entity entity-name="PortalPageColumn" package-name="org.ofbiz.common.portal" title="Defines a Portal Page"> > > <field name="portalPageId" type="id-ne"></field> > > > > 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=741129&r1=741128&r2=741129&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 Thu Feb 5 15:18:47 2009 > > @@ -22,19 +22,44 @@ > > import org.ofbiz.entity.condition.*; > > // only execute when a user is logged in > > if (parameters.userLogin) { > > + // find > > + userLoginSecurityGroupId = null; > > + condSec = EntityCondition.makeCondition([ > > + EntityCondition.makeCondition("groupId", EntityOperator.LIKE, parameters.parentPortalPageId + "%"), > > + EntityCondition.makeCondition("userLoginId", EntityOperator.EQUALS, parameters.userLogin.userLoginId) > > + ],EntityOperator.AND); > > + userLoginSecurityGroups = delegator.findList("UserLoginSecurityGroup", condSec, null, null, null, false); > > + > > + if (UtilValidate.isNotEmpty(userLoginSecurityGroups)) { > > + userLoginSecurityGroupId = userLoginSecurityGroups.get(0).get("groupId"); > > + } > > + > > + //get the portal page > > + cond1 = EntityCondition.makeCondition([ > > + EntityCondition.makeCondition("portalPageId", EntityOperator.LIKE, parameters.parentPortalPageId + "%"), > > + EntityCondition.makeCondition("securityGroupId", EntityOperator.EQUALS, userLoginSecurityGroupId), > > + EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, "_NA_"), > > + EntityCondition.makeCondition("parentPortalPageId", EntityOperator.EQUALS, null) > > + ],EntityOperator.AND); > > + portalMainPages = delegator.findList("PortalPage", cond1, null, null, null, false); > > + if (portalMainPages) { > > + parameters.portalPageId = portalMainPages.get(0).portalPageId; > > + } > > + > > ppCond = > > - EntityCondition.makeCondition([ > > - EntityCondition.makeCondition([ > > - EntityCondition.makeCondition("parentPortalPageId", EntityOperator.EQUALS, parameters.parentPortalPageId), > > - EntityCondition.makeCondition("portalPageId", EntityOperator.EQUALS, parameters.parentPortalPageId), > > - EntityCondition.makeCondition("originalPortalPageId", EntityOperator.EQUALS, parameters.parentPortalPageId) > > - ],EntityOperator.OR), > > - EntityCondition.makeCondition([ > > - EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, parameters.userLogin.userLoginId), > > - EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, "_NA_") > > - ],EntityOperator.OR), > > - ],EntityOperator.AND); > > + EntityCondition.makeCondition([ > > + EntityCondition.makeCondition([ > > + EntityCondition.makeCondition("parentPortalPageId", EntityOperator.EQUALS, parameters.portalPageId), > > + EntityCondition.makeCondition("portalPageId", EntityOperator.EQUALS, parameters.portalPageId), > > + EntityCondition.makeCondition("originalPortalPageId", EntityOperator.EQUALS, parameters.portalPageId) > > + ],EntityOperator.OR), > > + EntityCondition.makeCondition([ > > + EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, parameters.userLogin.userLoginId), > > + EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, "_NA_") > > + ],EntityOperator.OR), > > + ],EntityOperator.AND); > > portalPages = delegator.findList("PortalPage", ppCond, null, null, null, false); > > + > > // remove overridden system pages > > portalPages.each { portalPage -> > > if (portalPage.ownerUserLoginId.equals("_NA_")) { > > @@ -44,6 +69,8 @@ > > } > > } > > } > > + > > context.portalPages = portalPages; > > -} > > - > > + context.userLoginSecurityGroupId = userLoginSecurityGroupId; > > + > > +} > > \ No newline at end of file > > > > Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy > > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy?rev=741129&r1=741128&r2=741129&view=diff > > ============================================================================== > > --- ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy (original) > > +++ ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy Thu Feb 5 15:18:47 2009 > > @@ -21,21 +21,55 @@ > > import org.ofbiz.base.util.*; > > import org.ofbiz.entity.condition.*; > > > > +portalPage = null; > > portalPageId = parameters.portalPageId; > > if(!portalPageId){ > > portalPageId = parameters.parentPortalPageId; > > } > > > > -portalPage = delegator.findByPrimaryKey("PortalPage", [portalPageId : portalPageId]); > > -// check if the user created a private page for a system page > > -if (portalPage.ownerUserLoginId.equals("_NA_")) { > > - portalPages = delegator.findByAnd("PortalPage", [originalPortalPageId : portalPageId, ownerUserLoginId : parameters.userLogin.userLoginId]); > > - if (UtilValidate.isNotEmpty(portalPages)) { > > - portalPage = portalPages.get(0); > > +if (portalPageId) { > > + portalPage = delegator.findByPrimaryKey("PortalPage", [portalPageId : portalPageId]); > > +} > > + > > +if (!portalPage) { > > + // find the user private main page > > + condPrivat = EntityCondition.makeCondition([ > > + EntityCondition.makeCondition("originalPortalPageId", EntityOperator.LIKE, portalPageId + "%"), > > + EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, parameters.userLogin.userLoginId) > > + ],EntityOperator.AND); > > + privatPortalPages = delegator.findList("PortalPage", condPrivat, null, null, null, false); > > + > > + if (privatPortalPages) { > > + portalPage = privatPortalPages.get(0); > > + } else { > > + // look for system page according the current securitygroup > > + //get the security group > > + userLoginSecurityGroupId = null; > > + condSec = EntityCondition.makeCondition([ > > + EntityCondition.makeCondition("groupId", EntityOperator.LIKE, portalPageId + "%"), > > + EntityCondition.makeCondition("userLoginId", EntityOperator.EQUALS, parameters.userLogin.userLoginId) > > + ],EntityOperator.AND); > > + userLoginSecurityGroups = delegator.findList("UserLoginSecurityGroup", condSec, null, null, null, false); > > + if (UtilValidate.isNotEmpty(userLoginSecurityGroups)) { > > + userLoginSecurityGroupId = userLoginSecurityGroups.get(0).get("groupId"); > > + } > > + //get the portal page > > + cond1 = EntityCondition.makeCondition([ > > + EntityCondition.makeCondition("portalPageId", EntityOperator.LIKE, portalPageId + "%"), > > + EntityCondition.makeCondition("securityGroupId", EntityOperator.EQUALS, userLoginSecurityGroupId), > > + EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, "_NA_"), > > + EntityCondition.makeCondition("parentPortalPageId", EntityOperator.EQUALS, null) > > + ],EntityOperator.AND); > > + portalMainPages = delegator.findList("PortalPage", cond1, null, null, null, false); > > + if (portalMainPages) { > > + portalPage = portalMainPages.get(0); > > + } > > } > > } > > -parameters.portalPageId = portalPage.portalPageId; > > -context.portalPage = portalPage; > > -context.portalPageColumns = portalPage.getRelated("PortalPageColumn"); > > -context.portalPagePortlets = delegator.findByAnd("PortalPagePortletView", [portalPageId : portalPage.portalPageId]); > > > > +if (portalPage) { > > + parameters.portalPageId = portalPage.portalPageId; > > + context.portalPage = portalPage; > > + context.portalPageColumns = portalPage.getRelated("PortalPageColumn"); > > + context.portalPagePortlets = delegator.findByAnd("PortalPagePortletView", [portalPageId : portalPage.portalPageId]); > > +} > > \ No newline at end of file > > > > Modified: ofbiz/trunk/framework/common/widget/PortalPageForms.xml > > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageForms.xml?rev=741129&r1=741128&r2=741129&view=diff > > ============================================================================== > > --- ofbiz/trunk/framework/common/widget/PortalPageForms.xml (original) > > +++ ofbiz/trunk/framework/common/widget/PortalPageForms.xml Thu Feb 5 15:18:47 2009 > > @@ -28,8 +28,8 @@ > > </actions> > > > > <field name="portalPageId" title="${uiLabelMap.CommonId}" sort-field="true"> > > - <hyperlink description="${portalPageId}" target="editPortalPage?portalPageId=${portalPageId}&parentPortalPageId=${parameters.parentPortalPageId}"/> > > - </field> > > + <hyperlink description="${portalPageId}" target="editPortalPage?portalPageId=${portalPageId}&parentPortalPageId=${userLoginSecurityGroupId}"/> > > + </field> > > <field name="portalPageName" use-when="ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}" sort-field="true"><display/></field> > > <field name="portalPageName" use-when="!ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}" id-name="portalPageName" widget-style="tabletext" sort-field="true"> > > <display> > > @@ -58,7 +58,10 @@ > > </form> > > > > <form name="NewPortalPage" type="single" target="createPortalPage?mainPortalPageId=${parameters.mainPortalPageId}"> > > - <field name="parentPortalPageId"><hidden value="${parameters.parentPortalPageId}"/></field> > > + <actions> > > + <script location="component://common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy"/> > > + </actions> > > + <field name="parentPortalPageId"><hidden value="${userLoginSecurityGroupId}"/></field> > > <field name="portalPageName" parameter-name="portalPageName"><text/></field> > > <field name="description"><text/></field> > > <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field> > > > > Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml > > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=741129&r1=741128&r2=741129&view=diff > > ============================================================================== > > --- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original) > > +++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Thu Feb 5 15:18:47 2009 > > @@ -26,37 +26,56 @@ > > <Enumeration description="Customer Request Created" enumCode="CUST_CREATED" enumId="PRDS_CUST_CREATED" sequenceId="17" enumTypeId="PRDS_EMAIL"/> > > <Enumeration description="Customer Request Completed" enumCode="CUST_COMPLETE" enumId="PRDS_CUST_CONFIRM" sequenceId="18" enumTypeId="PRDS_EMAIL"/> > > > > - <!-- PortalPortlet Demo Data --> > > - <PortalPage portalPageId="MYPORTAL" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="_NA_" /> > > - <PortalPage portalPageId="00001" portalPageName="My Profile" ownerUserLoginId="admin" parentPortalPageId="MYPORTAL" /> > > - <PortalPage portalPageId="00002" portalPageName="My Communications" ownerUserLoginId="admin" parentPortalPageId="MYPORTAL" /> > > - <PortalPage portalPageId="00003" portalPageName="Other Communications" ownerUserLoginId="admin" parentPortalPageId="MYPORTAL" /> > > - <PortalPage portalPageId="00004" portalPageName="Company communications" ownerUserLoginId="admin" parentPortalPageId="MYPORTAL" /> > > - <PortalPage portalPageId="00005" portalPageName="My Time Sheets" ownerUserLoginId="admin" parentPortalPageId="MYPORTAL" /> > > - <PortalPage portalPageId="00006" portalPageName="My Tasks" ownerUserLoginId="admin" parentPortalPageId="MYPORTAL" /> > > - <PortalPage portalPageId="00007" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="DemoEmployee" originalPortalPageId="MYPORTAL" /> > > - <PortalPage portalPageId="00008" portalPageName="My Profile" ownerUserLoginId="DemoEmployee" parentPortalPageId="MYPORTAL" /> > > - <PortalPage portalPageId="00009" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="DemoCustomer" originalPortalPageId="MYPORTAL" /> > > - <PortalPage portalPageId="00010" portalPageName="My Profile" ownerUserLoginId="DemoCustomer" parentPortalPageId="MYPORTAL" /> > > - <PortalPage portalPageId="00011" portalPageName="Invoices" ownerUserLoginId="DemoCustomer" parentPortalPageId="MYPORTAL" /> > > - <PortalPage portalPageId="00012" portalPageName="Projects" ownerUserLoginId="DemoCustomer" parentPortalPageId="MYPORTAL" /> > > - > > - <PortalPageColumn portalPageId="MYPORTAL" columnSeqId="00001" /> > > - <PortalPageColumn portalPageId="00001" columnSeqId="00001" columnWidthPercentage="50" /> > > - <PortalPageColumn portalPageId="00001" columnSeqId="00002" columnWidthPercentage="50" /> > > - <PortalPageColumn portalPageId="00002" columnSeqId="00001" /> > > - <PortalPageColumn portalPageId="00003" columnSeqId="00001" /> > > - <PortalPageColumn portalPageId="00004" columnSeqId="00001" /> > > - <PortalPageColumn portalPageId="00005" columnSeqId="00001" /> > > - <PortalPageColumn portalPageId="00006" columnSeqId="00001" /> > > - <PortalPageColumn portalPageId="00007" columnSeqId="00001" /> > > - <PortalPageColumn portalPageId="00008" columnSeqId="00001" columnWidthPercentage="50" /> > > - <PortalPageColumn portalPageId="00008" columnSeqId="00002" columnWidthPercentage="50" /> > > - <PortalPageColumn portalPageId="00009" columnSeqId="00001" /> > > - <PortalPageColumn portalPageId="00010" columnSeqId="00001" columnWidthPercentage="50" /> > > - <PortalPageColumn portalPageId="00011" columnSeqId="00001" /> > > - <PortalPageColumn portalPageId="00012" columnSeqId="00001" /> > > - <PortalPageColumn portalPageId="00010" columnSeqId="00002" columnWidthPercentage="50" /> > > + <!-- PortalPortlet System provided pages --> > > + <!-- no security group --> > > + <PortalPage portalPageId="MYPORTAL_NONE" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="_NA_"/> > > + > > + <PortalPage portalPageId="MYPORTAL_ADMIN" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="_NA_" securityGroupId="FULLADMIN"/> > > + <PortalPage portalPageId="MYPORTAL_ADMIN1" sequenceNum="01" portalPageName="My Profile" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_ADMIN"/> > > + <PortalPage portalPageId="MYPORTAL_ADMIN2" sequenceNum="02" portalPageName="My Communications" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_ADMIN"/> > > + <PortalPage portalPageId="MYPORTAL_ADMIN3" sequenceNum="03" portalPageName="Other Communications" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_ADMIN"/> > > + <PortalPage portalPageId="MYPORTAL_ADMIN4" sequenceNum="04" portalPageName="Company communications" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_ADMIN"/> > > + <PortalPage portalPageId="MYPORTAL_ADMIN5" sequenceNum="05" portalPageName="My Time Sheets" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_ADMIN"/> > > + <PortalPage portalPageId="MYPORTAL_ADMIN6" sequenceNum="06" portalPageName="My Tasks" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_ADMIN"/> > > + > > + <PortalPage portalPageId="MYPORTAL_EMPLOYEE" 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"/> > > + <PortalPage portalPageId="MYPORTAL_EMPLOYEE4" sequenceNum="04" portalPageName="Company communications" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/> > > + <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" /> > > + > > + <PortalPageColumn portalPageId="MYPORTAL_NONE" columnSeqId="00001" /> > > + > > + <PortalPageColumn portalPageId="MYPORTAL_ADMIN" columnSeqId="00001" /> > > + <PortalPageColumn portalPageId="MYPORTAL_ADMIN1" columnSeqId="00001" columnWidthPercentage="50" /> > > + <PortalPageColumn portalPageId="MYPORTAL_ADMIN1" columnSeqId="00002" columnWidthPercentage="50" /> > > + <PortalPageColumn portalPageId="MYPORTAL_ADMIN2" columnSeqId="00001" /> > > + <PortalPageColumn portalPageId="MYPORTAL_ADMIN3" columnSeqId="00001" /> > > + <PortalPageColumn portalPageId="MYPORTAL_ADMIN4" columnSeqId="00001" /> > > + <PortalPageColumn portalPageId="MYPORTAL_ADMIN5" columnSeqId="00001" /> > > + <PortalPageColumn portalPageId="MYPORTAL_ADMIN6" columnSeqId="00001" /> > > + > > + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE" columnSeqId="00001" /> > > + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE1" columnSeqId="00001" columnWidthPercentage="50" /> > > + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE1" columnSeqId="00002" columnWidthPercentage="50" /> > > + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE2" columnSeqId="00001" /> > > + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE3" columnSeqId="00001" /> > > + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE4" columnSeqId="00001" /> > > + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE5" columnSeqId="00001" /> > > + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE6" columnSeqId="00001" /> > > + > > + <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER" columnSeqId="00001" /> > > + <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER1" columnSeqId="00001" columnWidthPercentage="50" /> > > + <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER1" columnSeqId="00002" columnWidthPercentage="50" /> > > + <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER2" columnSeqId="00001" /> > > + <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER3" columnSeqId="00001" /> > > > > <PortalPortlet portalPortletId="Attributes" portletName="Attributes" screenName="Attributes" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Attributes in myportal from party" /> > > <PortalPortlet portalPortletId="AvsSettings" portletName="Avs Settings" screenName="AvsSettings" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Avs Settings in myportal from party" /> > > @@ -84,55 +103,62 @@ > > <PortalPortlet portalPortletId="WELCOME" portletName="Welcome" screenName="welcomePortlet" screenLocation="component://common/widget/PortletScreens.xml" description="OFBiz Welcome Message" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" /> > > <PortalPortlet portalPortletId="LOGIN" portletName="Login" screenName="loginPortlet" screenLocation="component://common/widget/PortletScreens.xml" editFormName="LoginPortletEdit" editFormLocation="component://common/widget/PortletEditForms.xml" description="Login Form" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" /> > > > > - <PortalPagePortlet portalPageId="MYPORTAL" portalPortletId="listrequestlist" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00001" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> > > - <PortalPagePortlet portalPageId="00001" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00001" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00001" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" sequenceNum="4" /> > > - <PortalPagePortlet portalPageId="00001" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00001" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" /> > > - <PortalPagePortlet portalPageId="00001" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" /> > > - <PortalPagePortlet portalPageId="00001" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" /> > > - <PortalPagePortlet portalPageId="00001" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" /> > > - <PortalPagePortlet portalPageId="00001" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002" /> > > - <PortalPagePortlet portalPageId="00001" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" /> > > - <PortalPagePortlet portalPageId="00001" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" /> > > - <PortalPagePortlet portalPageId="00002" portalPortletId="mycommunications" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00003" portalPortletId="otherCommunications" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00004" portalPortletId="mycompanycomms" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00005" portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00006" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00007" portalPortletId="mycommunications" portletSeqId="00001" columnSeqId="00001" sequenceNum="-1" /> > > - <PortalPagePortlet portalPageId="00007" portalPortletId="mycompanycomms" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> > > - <PortalPagePortlet portalPageId="00007" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> > > - <PortalPagePortlet portalPageId="00007" portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001" sequenceNum="5" /> > > - <PortalPagePortlet portalPageId="00008" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00008" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00008" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00008" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00008" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00008" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" /> > > - <PortalPagePortlet portalPageId="00008" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" /> > > - <PortalPagePortlet portalPageId="00008" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002" /> > > - <PortalPagePortlet portalPageId="00008" portalPortletId="Content" portletSeqId="00002" columnSeqId="00002" /> > > - <PortalPagePortlet portalPageId="00008" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" /> > > - <PortalPagePortlet portalPageId="00008" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" /> > > - <PortalPagePortlet portalPageId="00008" portalPortletId="UserLogin" portletSeqId="00002" columnSeqId="00002" sequenceNum="0" /> > > - <PortalPagePortlet portalPageId="00009" portalPortletId="ListCustRequests" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> > > - <PortalPagePortlet portalPageId="00009" portalPortletId="ListCustRequestsComp" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00009" portalPortletId="ListPartyCommEvents" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00010" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00010" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00010" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00010" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00010" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00010" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" sequenceNum="0" /> > > - <PortalPagePortlet portalPageId="00010" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" /> > > - <PortalPagePortlet portalPageId="00010" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" /> > > - <PortalPagePortlet portalPageId="00010" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" /> > > - <PortalPagePortlet portalPageId="00010" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002" /> > > - <PortalPagePortlet portalPageId="00010" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" /> > > - <PortalPagePortlet portalPageId="00010" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" /> > > - <PortalPagePortlet portalPageId="00011" portalPortletId="ListInvoices" portletSeqId="00001" columnSeqId="00001" /> > > - <PortalPagePortlet portalPageId="00012" portalPortletId="ListProjects" portletSeqId="00001" columnSeqId="00001" /> > > -</entity-engine-xml> > > + <PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> > > + > > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN" portalPortletId="listrequestlist" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" sequenceNum="4" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN1" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN2" portalPortletId="mycommunications" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN3" portalPortletId="otherCommunications" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN4" portalPortletId="mycompanycomms" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN5" portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_ADMIN6" portalPortletId="mytasks" portletSeqId="00001" columnSeqId="00001" /> > > + > > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE" portalPortletId="listrequestlist" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" sequenceNum="4" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE2" portalPortletId="mycommunications" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE3" portalPortletId="otherCommunications" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE4" portalPortletId="mycompanycomms" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE5" portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE6" 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" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" sequenceNum="0" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER2" portalPortletId="ListInvoices" portletSeqId="00001" columnSeqId="00001" /> > > + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER3" portalPortletId="ListProjects" portletSeqId="00001" columnSeqId="00001" /> > > + > > +</entity-engine-xml> > > \ No newline at end of file > > > > Modified: ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl > > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl?rev=741129&r1=741128&r2=741129&view=diff > > ============================================================================== > > --- ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl (original) > > +++ ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl Thu Feb 5 15:18:47 2009 > > @@ -29,7 +29,7 @@ > > </#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> > > - <li class="opposed"><a href="<@ofbizUrl>ManagePortalPages?parentPortalPageId=MYPORTAL</@ofbizUrl>">${uiLabelMap.CommonPreferences}</a></li> > > + <li class="opposed"><a href="<@ofbizUrl>ManagePortalPages?parentPortalPageId=${userLoginSecurityGroupId?if_exists}</@ofbizUrl>">${uiLabelMap.CommonPreferences}</a></li> > > </ul> > > </li> > > </ul> > > > > Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml > > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=741129&r1=741128&r2=741129&view=diff > > ============================================================================== > > --- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original) > > +++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Thu Feb 5 15:18:47 2009 > > @@ -47,7 +47,7 @@ > > <!--set field="applicationMenuName" value="ExampleAppBar" global="true"/> > > <set field="applicationMenuLocation" value="component://example/widget/example/ExampleMenus.xml" global="true"/--> > > <set field="appheaderTemplate" value="component://myportal/templates/appheader.ftl"/> > > - <set field="parameters.parentPortalPageId" value="MYPORTAL" global="true"/> > > + <set field="parameters.parentPortalPageId" value="MYPORTAL"/> > > <set field="parameters.userLogin.userLoginId" from-field="userLogin.userLoginId"/> > > <script location="component://common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy"/> > > <entity-one entity-name="PartyNameView" value-field="partyNameView"> > > @@ -159,13 +159,6 @@ > > <set field="parameters.portalPageId" value="MYPORTAL"/> > > <script location="component://common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy"/> > > <set field="headerItem" from-field="parameters.portalPageId"/> > > - <!--My Profile From Party--> > > - <set field="titleProperty" value="PageTitleViewPartyProfile"/> > > - <set field="tabButtonItem" value="viewprofile"/> > > - <set field="labelTitleProperty" value="PartyTaxAuthInfos"/> > > - <set field="parameters.partyId" from-field="userLogin.userLoginId"/> > > - <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/> > > - <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/> > > </actions> > > <widgets> > > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > > > > Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml > > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=741129&r1=741128&r2=741129&view=diff > > ============================================================================== > > --- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original) > > +++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Thu Feb 5 15:18:47 2009 > > @@ -166,11 +166,11 @@ > > </drop-down> > > </field> > > <field name="updateButton" widget-style="smallSubmit"><submit /></field> > > - <field name="currentStatusId" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field> > > - <field name="estimatedStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskPlanStartDate}"><display type="date"/></field> > > - <field name="estimatedCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskPlanEndDate}"><display type="date"/></field> > > - <field name="actualStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskActStartDate}"><display type="date"/></field> > > - <field name="actualCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskActEndDate}"><display type="date"/></field> > > + <field name="currentStatusId" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field> > > + <field name="estimatedStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskPlanStartDate}"><display type="date"/></field> > > + <field name="estimatedCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskPlanEndDate}"><display type="date"/></field> > > + <field name="actualStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskActStartDate}"><display type="date"/></field> > > + <field name="actualCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskActEndDate}"><display type="date"/></field> > > <field name="plannedHours" map-name="taskResult.taskInfo"><display/></field> > > <field name="actualHours" map-name="taskResult.taskInfo"><display/></field> > > </form> > > > > Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml > > URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=741129&r1=741128&r2=741129&view=diff > > ============================================================================== > > --- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original) > > +++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Thu Feb 5 15:18:47 2009 > > @@ -787,7 +787,7 @@ > > <widgets> > > <section> > > <condition> > > - <not><if-empty field="custRequests"/></not> > > + <!--not><if-empty field="custRequests"/></not--> > > </condition> > > <widgets> > > <screenlet title="${uiLabelMap.MyPortalIncomingCustRequests}" navigation-form-name="ListRequestList"> > > > > http://www.antwebsystems.com : Quality OFBiz support for competitive rates.... |
«
Return to OFBiz - Dev
|
1 view|%1 views
| Free forum by Nabble | Edit this page |