You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/03/29 10:07:24 UTC
svn commit: r759644 - in /ofbiz/trunk: applications/party/data/
applications/party/webapp/partymgr/WEB-INF/actions/party/
applications/party/webapp/partymgr/party/profileblocks/
applications/party/widget/partymgr/ specialpurpose/myportal/data/ specialp...
Author: hansbak
Date: Sun Mar 29 08:07:23 2009
New Revision: 759644
URL: http://svn.apache.org/viewvc?rev=759644&view=rev
Log:
move the profileportlets from myportal to party
Modified:
ofbiz/trunk/applications/party/data/PartyPortletData.xml
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetLoyaltyPoints.groovy
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetPaymentMethods.groovy
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
Modified: ofbiz/trunk/applications/party/data/PartyPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyPortletData.xml?rev=759644&r1=759643&r2=759644&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/data/PartyPortletData.xml (original)
+++ ofbiz/trunk/applications/party/data/PartyPortletData.xml Sun Mar 29 08:07:23 2009
@@ -24,8 +24,51 @@
<!-- communications -->
<PortalPortlet portalPortletId="MyCommunications" portletName="My Communications" description="Communication list"
- screenName="MyCommunicationEvents" screenLocation="component://party/widget/partymgr/CommunicationScreens.xml"
+ screenName="MyCommunicationEvents"
+ screenLocation="component://party/widget/partymgr/CommunicationScreens.xml"
editFormName="EditPartyId" editFormLocation="component://party/webapp/partymgr/communication/CommForms.xml" />
-
-
+ <PortalPortlet portalPortletId="Attributes" portletName="Attributes"
+ screenName="Attributes"
+ screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+ description="Attributes in myportal from party" />
+ <PortalPortlet portalPortletId="AvsSettings" portletName="Avs Settings"
+ screenName="AvsSettings"
+ screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+ description="Avs Settings in myportal from party" />
+ <PortalPortlet portalPortletId="Content" portletName="Content"
+ screenName="Content"
+ screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+ description="Content in myportal from party" />
+ <PortalPortlet portalPortletId="LoyaltyPoints" portletName="Loyalty Points"
+ screenName="LoyaltyPoints"
+ screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+ description="Loyalty Points in myportal from party" />
+ <PortalPortlet portalPortletId="MYTASKSPARTY" portletName="My Tasks From Party"
+ screenName="mytasks"
+ screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+ description="My Tasks in myportal from party" />
+ <PortalPortlet portalPortletId="Notes" portletName="Notes"
+ screenName="Notes"
+ screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+ description="Notes in myportal from party" />
+ <PortalPortlet portalPortletId="PaymentMethods" portletName="Payment Methods"
+ screenName="PaymentMethods"
+ screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+ description="PaymentMethods in myportal from party" />
+ <PortalPortlet portalPortletId="ShipperAccount" portletName="Shipper Account"
+ screenName="ShipperAccount"
+ screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+ description="Shipper Account in myportal from party" />
+ <PortalPortlet portalPortletId="UserLogin" portletName="User Login"
+ screenName="UserLogin"
+ screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+ description="User Login in myportal from party" />
+ <PortalPortlet portalPortletId="Visits" portletName="Visits"
+ screenName="Visits"
+ screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+ description="Visits in myportal from party" />
+ <PortalPortlet portalPortletId="contact" portletName="Contact"
+ screenName="Contact"
+ screenLocation="component://party/widget/partymgr/ProfileScreens.xml"
+ description="contact in myportal from party" />
</entity-engine-xml>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetLoyaltyPoints.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetLoyaltyPoints.groovy?rev=759644&r1=759643&r2=759644&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetLoyaltyPoints.groovy (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetLoyaltyPoints.groovy Sun Mar 29 08:07:23 2009
@@ -19,7 +19,7 @@
import org.ofbiz.base.util.*;
-partyId = partyId ?: parameters.partyId;
+partyId = parameters.partyId ? parameters.partyId : userLogin.partyId ;
if (partyId) {
// get the system user
Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetPaymentMethods.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetPaymentMethods.groovy?rev=759644&r1=759643&r2=759644&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetPaymentMethods.groovy (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetPaymentMethods.groovy Sun Mar 29 08:07:23 2009
@@ -19,6 +19,8 @@
import org.ofbiz.accounting.payment.PaymentWorker;
-partyId = partyId ?: parameters.partyId;
-context.showOld = "true".equals(parameters.SHOW_OLD);
-context.paymentMethodValueMaps = PaymentWorker.getPartyPaymentMethodValueMaps(delegator, partyId, showOld);
\ No newline at end of file
+partyId = parameters.partyId ? parameters.partyId : userLogin.partyId;
+showOld = "true".equals(parameters.SHOW_OLD);
+context.showOld = showOld;
+context.partyId = partyId;
+context.paymentMethodValueMaps = PaymentWorker.getPartyPaymentMethodValueMaps(delegator, partyId, showOld);
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl?rev=759644&r1=759643&r2=759644&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl Sun Mar 29 08:07:23 2009
@@ -22,7 +22,7 @@
<ul>
<li class="h3">${uiLabelMap.PartyContactInformation}</li>
<#if security.hasEntityPermission("PARTYMGR", "_CREATE", session) || userLogin.partyId == party.partyId>
- <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
</#if>
</ul>
<br class="clear" />
@@ -102,7 +102,7 @@
<#elseif "EMAIL_ADDRESS" = contactMech.contactMechTypeId>
<div>
${contactMech.infoString?if_exists}
- <a href="<@ofbizUrl>EditCommunicationEvent?partyIdFrom=${userLogin.partyId}&partyIdTo=${party.partyId}&communicationEventTypeId=EMAIL_COMMUNICATION&contactMechIdTo=${contactMech.contactMechId}&contactMechTypeId=EMAIL_ADDRESS<#if thisUserPrimaryEmail?has_content>&contactMechIdFrom=${thisUserPrimaryEmail.contactMechId}</#...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonSendEmail}</a>
+ <a href="<@ofbizUrl>EditCommunicationEvent?partyIdFrom=${userLogin.partyId}&partyIdTo=${partyId}&communicationEventTypeId=EMAIL_COMMUNICATION&contactMechIdTo=${contactMech.contactMechId}&contactMechTypeId=EMAIL_ADDRESS<#if thisUserPrimaryEmail?has_content>&contactMechIdFrom=${thisUserPrimaryEmail.contactMechId}</#...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonSendEmail}</a>
</div>
<#elseif "WEB_ADDRESS" = contactMech.contactMechTypeId>
<div>
@@ -119,8 +119,8 @@
<#-- create cust request -->
<#if custRequestTypes?exists>
<form name="createCustRequestForm" action="<@o...@ofbizUrl>" method="POST" onSubmit="javascript:submitFormDisableSubmits(this)">
- <input type="hidden" name="partyId" value="${party.partyId}"/>
- <input type="hidden" name="fromPartyId" value="${party.partyId}"/>
+ <input type="hidden" name="partyId" value="${partyId}"/>
+ <input type="hidden" name="fromPartyId" value="${partyId}"/>
<input type="hidden" name="fulfillContactMechId" value="${contactMech.contactMechId}"/>
<select name="custRequestTypeId">
<#list custRequestTypes as type>
@@ -133,12 +133,12 @@
</td>
<td valign="top"><b>(${partyContactMech.allowSolicitation?if_exists})</b></td>
<td class="button-col">
- <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session) || userLogin.partyId == party.partyId>
- <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
+ <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session) || userLogin.partyId == partyId>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
</#if>
- <#if security.hasEntityPermission("PARTYMGR", "_DELETE", session) || userLogin.partyId == party.partyId>
+ <#if security.hasEntityPermission("PARTYMGR", "_DELETE", session) || userLogin.partyId == partyId>
<form name="partyDeleteContact" method="post" action="<@o...@ofbizUrl>" onSubmit="javascript:submitFormDisableSubmits(this)">
- <input name="partyId" value="${party.partyId}" type="hidden"/>
+ <input name="partyId" value="${partyId}" type="hidden"/>
<input name="contactMechId" value="${contactMech.contactMechId}" type="hidden"/>
<input type="submit" class="smallSubmit" value="${uiLabelMap.CommonExpire}"/>
</form>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl?rev=759644&r1=759643&r2=759644&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl Sun Mar 29 08:07:23 2009
@@ -22,9 +22,9 @@
<ul>
<li class="h3">${uiLabelMap.PartyPaymentMethodInformation}</li>
<#if security.hasEntityPermission("PAY_INFO", "_CREATE", session)>
- <li><a href="<@o...@ofbizUrl>">${uiLabelMap.AccountingCreateNewEftAccount}</a></li>
- <li><a href="<@o...@ofbizUrl>">${uiLabelMap.AccountingCreateNewGiftCard}</a></li>
- <li><a href="<@o...@ofbizUrl>">${uiLabelMap.AccountingCreateNewCreditCard}</a></li>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.AccountingCreateNewEftAccount}</a></li>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.AccountingCreateNewGiftCard}</a></li>
+ <li><a href="<@o...@ofbizUrl>">${uiLabelMap.AccountingCreateNewCreditCard}</a></li>
</#if>
</ul>
<br class="clear" />
@@ -65,7 +65,7 @@
<a href="/accounting/control/manualETx?paymentMethodId=${paymentMethod.paymentMethodId}${externalKeyParam}">${uiLabelMap.PartyManualTx}</a>
</#if>
<#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session)>
- <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
</#if>
<#-- </td> -->
<#elseif "GIFT_CARD" == paymentMethod.paymentMethodTypeId>
@@ -101,7 +101,7 @@
</td>
<td class="button-col">
<#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session)>
- <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
</#if>
<#-- </td> -->
<#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId>
@@ -117,7 +117,7 @@
</td>
<td class="button-col">
<#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session)>
- <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
</#if>
<#-- </td> -->
<#elseif "COMPANY_CHECK" == paymentMethod.paymentMethodTypeId>
@@ -136,7 +136,7 @@
<#-- </td> -->
</#if>
<#if security.hasEntityPermission("PAY_INFO", "_DELETE", session)>
- <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonExpire}</a>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonExpire}</a>
<#else>
</#if>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=759644&r1=759643&r2=759644&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Sun Mar 29 08:07:23 2009
@@ -69,7 +69,6 @@
<set field="layoutSettings.styleSheets[]" value="/images/prototypejs/progress_bar.css" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/partymgr/js/PartyProfileContent.js" global="true"/>
<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="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=759644&r1=759643&r2=759644&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Sun Mar 29 08:07:23 2009
@@ -121,7 +121,9 @@
<screen name="Contact">
<section>
<actions>
+ <set field="partyId" from-field="parameters.partyId" default-value="${userLogin.partyId}"/>
<script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetContactMechs.groovy"/>
+ <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
</actions>
<widgets>
<platform-specific>
@@ -151,8 +153,10 @@
<screen name="Attributes">
<section>
<actions>
+ <set field="partyId" from-field="parameters.partyId" default-value="${userLogin.partyId}"/>
+ <entity-one entity-name="Party" value-field="party"/>
<entity-and entity-name="PartyAttribute" list="attributes">
- <field-map field-name="partyId" from-field="parameters.partyId"/>
+ <field-map field-name="partyId" from-field="partyId"/>
</entity-and>
</actions>
<widgets>
@@ -168,8 +172,10 @@
<screen name="AvsSettings">
<section>
<actions>
+ <set field="partyId" from-field="parameters.partyId" default-value="${userLogin.partyId}"/>
+ <entity-one entity-name="Party" value-field="party"/>
<entity-and entity-name="PartyIcsAvsOverride" list="avsOverride">
- <field-map field-name="partyId" from-field="parameters.partyId"/>
+ <field-map field-name="partyId" from-field="partyId"/>
</entity-and>
</actions>
<widgets>
@@ -215,8 +221,10 @@
<screen name="UserLogin">
<section>
<actions>
+ <set field="partyId" from-field="parameters.partyId" default-value="${userLogin.partyId}"/>
+ <entity-one entity-name="Party" value-field="party"/>
<entity-and entity-name="UserLogin" list="userLogins">
- <field-map field-name="partyId" from-field="parameters.partyId"/>
+ <field-map field-name="partyId" from-field="partyId"/>
</entity-and>
</actions>
<widgets>
@@ -232,8 +240,9 @@
<screen name="Visits">
<section>
<actions>
+ <set field="partyId" from-field="parameters.partyId" default-value="${userLogin.partyId}"/>
<entity-and entity-name="Visit" list="visits">
- <field-map field-name="partyId" from-field="parameters.partyId"/>
+ <field-map field-name="partyId" from-field="partyId"/>
<order-by field-name="-fromDate"/>
<limit-range start="0" size="5"/>
</entity-and>
@@ -405,10 +414,11 @@
<screen name="ContentList">
<section>
<actions>
+ <set field="partyId" from-field="parameters.partyId" default-value="${userLogin.partyId}"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
<entity-and entity-name="PartyContent" list="partyContent">
- <field-map field-name="partyId" from-field="parameters.partyId"/>
+ <field-map field-name="partyId" from-field="partyId"/>
</entity-and>
</actions>
<widgets>
@@ -424,8 +434,9 @@
<screen name="Notes">
<section>
<actions>
+ <set field="partyId" from-field="parameters.partyId" default-value="${userLogin.partyId}"/>
<entity-and entity-name="PartyNoteView" list="notes">
- <field-map field-name="targetPartyId" from-field="parameters.partyId"/>
+ <field-map field-name="targetPartyId" from-field="partyId"/>
<order-by field-name="-noteDateTime"/>
</entity-and>
</actions>
Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=759644&r1=759643&r2=759644&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Sun Mar 29 08:07:23 2009
@@ -80,17 +80,6 @@
<PortletCategory portletCategoryId="LIST_REQUEST" description="List(s) Request"/>
<PortletCategory portletCategoryId="LIST_CUSTOMER" description="List(s) of Customer" />
- <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" />
- <PortalPortlet portalPortletId="Content" portletName="Content" screenName="Content" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Content in myportal from party" />
- <PortalPortlet portalPortletId="LoyaltyPoints" portletName="Loyalty Points" screenName="LoyaltyPoints" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Loyalty Points in myportal from party" />
- <PortalPortlet portalPortletId="MYTASKSPARTY" portletName="My Tasks From Party" screenName="mytasksParty" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="My Tasks in myportal from party" />
- <PortalPortlet portalPortletId="Notes" portletName="Notes" screenName="Notes" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Notes in myportal from party" />
- <PortalPortlet portalPortletId="PaymentMethods" portletName="Payment Methods" screenName="PaymentMethods" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="PaymentMethods in myportal from party" />
- <PortalPortlet portalPortletId="ShipperAccount" portletName="Shipper Account" screenName="ShipperAccount" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Shipper Account in myportal from party" />
- <PortalPortlet portalPortletId="UserLogin" portletName="User Login" screenName="UserLogin" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="User Login in myportal from party" />
- <PortalPortlet portalPortletId="Visits" portletName="Visits" screenName="Visits" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Visits in myportal from party" />
- <PortalPortlet portalPortletId="contact" portletName="Contact" screenName="Contact" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="contact in myportal from party" />
<PortalPortlet portalPortletId="mycompanycomms" portletName="My Company Comms" screenName="MyCompanyComms" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="My Company Comms From My Page" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />
<PortalPortlet portalPortletId="mytasks" portletName="My Tasks" screenName="MyTasks" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="My Tasks From My Page" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />
<PortalPortlet portalPortletId="listrequestlist" portletName="List Request List" screenName="ListRequestList" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Request List From My Page" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />
Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=759644&r1=759643&r2=759644&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Sun Mar 29 08:07:23 2009
@@ -55,7 +55,7 @@
<screen name="CommonPartyDecorator">
<section>
<actions>
- <set field="headerItem" value="viewprofile"/>
+ <set field="headerItem" value="${parameters.portalPageId}"/>
<set field="partyId" from-field="userLogin.partyId"/>
<set field="parameters.partyId" from-field="userLogin.partyId"/>
<entity-one entity-name="Party" value-field="party"/>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=759644&r1=759643&r2=759644&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Sun Mar 29 08:07:23 2009
@@ -589,599 +589,4 @@
</section>
</screen>
- <screen name="ListPartyCommEvents">
- <section>
- <actions>
- <set field="partyId" from-field="userLogin.partyId"/>
- <set field="status" from-field="parameters.status" default-value="open"/>
- <set field="status" value="${bsh:"all".equals(status)?"%":"open"}"/>
- <entity-condition list="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel">
- <condition-list combine="and">
- <condition-expr field-name="fromPartyId" operator="equals" value="${userLogin.partyId}"/>
- <condition-list combine="or">
- <condition-expr field-name="statusId" operator="equals" value="CRQ_REVIEWED"/>
- <condition-expr field-name="statusId" operator="equals" value="CRQ_ACCEPTED"/>
- </condition-list>
- </condition-list>
- <order-by field-name="+priority"/>
- <order-by field-name="+custRequestDate"/>
- </entity-condition>
- <entity-condition list="custRequestsCompleted" entity-name="CustRequestInfoAndWorkEffortAndPartyRel">
- <condition-list combine="and">
- <condition-expr field-name="fromPartyId" operator="equals" value="${userLogin.partyId}"/>
- <condition-list combine="or">
- <condition-expr field-name="statusId" operator="equals" value="CRQ_COMPLETED"/>
- <condition-expr field-name="statusId" operator="equals" value="CRQ_CANCELLED"/>
- </condition-list>
- </condition-list>
- <order-by field-name="custRequestDate"/>
- </entity-condition>
- <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/>
- <entity-condition list="companyCustRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel">
- <condition-list combine="and">
- <condition-expr field-name="partyIdFrom" operator="equals" value="${myCompanyId}"/>
- <condition-expr field-name="fromPartyId" operator="not-equals" value="${userLogin.partyId}"/>
- </condition-list>
- <order-by field-name="custRequestDate"/>
- </entity-condition>
- <!-- only list internal notes to the customer do not show the incoming or outgoing emails: will confuse only -->
- <entity-condition entity-name="CommunicationEventAndRole" list="commEvents">
- <condition-list combine="and">
- <condition-expr field-name="communicationEventTypeId" operator="equals" value="COMMENT_NOTE" />
- <condition-expr field-name="partyId" operator="equals" value="${partyId}" />
- <condition-list combine="or">
- <condition-expr field-name="roleStatusId"
- operator="not-equals" value="COM_ROLE_COMPLETED" />
- <condition-expr field-name="roleStatusId"
- operator="like" value="${status}" />
- </condition-list>
- </condition-list>
- <order-by field-name="-datetimeStarted" />
- </entity-condition>
- </actions>
- <widgets>
- <section>
- <widgets>
- <screenlet title="${uiLabelMap.MyPortalOtherCompanyCustomerRequests}" navigation-form-name="ListOtherCompanyRequests">
- <include-form name="ListOtherCompanyRequests" location="component://myportal/widget/MyPortalForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- <section>
- <widgets>
- <screenlet title="${uiLabelMap.MyPortalCommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
- navigation-menu-name="communicationsMenu" navigation-form-name="ListPartyCommEvents" name="myComms">
- <include-menu name="communicationsMenu" location="component://myportal/widget/MyPortalMenus.xml" />
- <include-form name="ListPartyCommEvents" location="component://myportal/widget/MyPortalForms.xml" />
- </screenlet>
- </widgets>
- </section>
- </widgets>
- </section>
- </screen>
-
- <screen name="ContentList">
- <section>
- <actions>
- <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
- <entity-and entity-name="PartyContent" list="partyContent">
- <field-map field-name="partyId" from-field="parameters.partyId"/>
- </entity-and>
- </actions>
- <widgets>
- <platform-specific>
- <html>
- <html-template location="component://party/webapp/partymgr/party/profileblocks/ContentList.ftl"/>
- </html>
- </platform-specific>
- </widgets>
- </section>
- </screen>
-
- <!-- My Profile Screens -->
- <screen name="Contact">
- <section>
- <actions>
- <set field="parameters.partyId" from-field="userLogin.partyId"/>
- <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>
- <section>
- <condition>
- <not><if-empty field="party"/></not>
- </condition>
- <widgets>
- <section>
- <widgets>
- <include-screen name="Contact" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- </widgets>
- </section>
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
- </container>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen>
-
- <screen name="contactsAndAccounts">
- <section>
- <actions>
- <set field="parameters.partyId" from-field="userLogin.partyId"/>
- <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>
- <section>
- <condition>
- <not><if-empty field="party"/></not>
- </condition>
- <widgets>
- <section>
- <widgets>
- <include-screen name="contactsAndAccounts" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- </widgets>
- </section>
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
- </container>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen>
-
- <screen name="LoyaltyPoints">
- <section>
- <actions>
- <set field="parameters.partyId" from-field="userLogin.partyId"/>
- <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>
- <section>
- <condition>
- <not><if-empty field="party"/></not>
- </condition>
- <widgets>
- <section>
- <widgets>
- <include-screen name="LoyaltyPoints" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- </widgets>
- </section>
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
- </container>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen>
-
- <screen name="PaymentMethods">
- <section>
- <actions>
- <set field="parameters.partyId" from-field="userLogin.partyId"/>
- <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>
- <section>
- <condition>
- <not><if-empty field="party"/></not>
- </condition>
- <widgets>
- <section>
- <widgets>
- <include-screen name="PaymentMethods" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- </widgets>
- </section>
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
- </container>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen>
-
- <screen name="AvsSettings">
- <section>
- <actions>
- <set field="parameters.partyId" from-field="userLogin.partyId"/>
- <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>
- <section>
- <condition>
- <not><if-empty field="party"/></not>
- </condition>
- <widgets>
- <section>
- <widgets>
- <include-screen name="AvsSettings" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- </widgets>
- </section>
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
- </container>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen>
-
- <screen name="FinAccounts">
- <section>
- <actions>
- <set field="parameters.partyId" from-field="userLogin.partyId"/>
- <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>
- <section>
- <condition>
- <not><if-empty field="party"/></not>
- </condition>
- <widgets>
- <section>
- <widgets>
- <include-screen name="FinAccounts" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- </widgets>
- </section>
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
- </container>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen>
-
- <screen name="UserLogin">
- <section>
- <actions>
- <set field="parameters.partyId" from-field="userLogin.partyId"/>
- <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>
- <section>
- <condition>
- <not><if-empty field="party"/></not>
- </condition>
- <widgets>
- <section>
- <widgets>
- <include-screen name="UserLogin" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- </widgets>
- </section>
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
- </container>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen>
-
- <screen name="Attributes">
- <section>
- <actions>
- <set field="parameters.partyId" from-field="userLogin.partyId"/>
- <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>
- <section>
- <condition>
- <not><if-empty field="party"/></not>
- </condition>
- <widgets>
- <section>
- <widgets>
- <include-screen name="Attributes" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- </widgets>
- </section>
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
- </container>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen>
-
- <screen name="Visits">
- <section>
- <actions>
- <set field="parameters.partyId" from-field="userLogin.partyId"/>
- <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>
- <section>
- <condition>
- <not><if-empty field="party"/></not>
- </condition>
- <widgets>
- <section>
- <widgets>
- <include-screen name="Visits" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- </widgets>
- </section>
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
- </container>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen>
-
- <screen name="Cart">
- <section>
- <actions>
- <set field="parameters.partyId" from-field="userLogin.partyId"/>
- <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>
- <section>
- <condition>
- <not><if-empty field="party"/></not>
- </condition>
- <widgets>
- <section>
- <widgets>
- <include-screen name="Cart" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- </widgets>
- </section>
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
- </container>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen>
-
- <screen name="SerializedInventory">
- <section>
- <actions>
- <set field="parameters.partyId" from-field="userLogin.partyId"/>
- <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>
- <section>
- <condition>
- <not><if-empty field="party"/></not>
- </condition>
- <widgets>
- <section>
- <widgets>
- <include-screen name="SerializedInventory" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- </widgets>
- </section>
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
- </container>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen>
-
- <screen name="Subscriptions">
- <section>
- <actions>
- <set field="parameters.partyId" from-field="userLogin.partyId"/>
- <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>
- <section>
- <condition>
- <not><if-empty field="party"/></not>
- </condition>
- <widgets>
- <section>
- <widgets>
- <include-screen name="Subscriptions" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- </widgets>
- </section>
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
- </container>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen>
-
- <screen name="Content">
- <section>
- <actions>
- <set field="parameters.partyId" from-field="userLogin.partyId"/>
- <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>
- <section>
- <condition>
- <not><if-empty field="party"/></not>
- </condition>
- <widgets>
- <section>
- <widgets>
- <include-screen name="Content" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- </widgets>
- </section>
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
- </container>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen>
-
- <screen name="ShipperAccount">
- <section>
- <actions>
- <set field="parameters.partyId" from-field="userLogin.partyId"/>
- <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>
- <section>
- <condition>
- <not><if-empty field="party"/></not>
- </condition>
- <widgets>
- <section>
- <widgets>
- <include-screen name="ShipperAccount" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- </widgets>
- </section>
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
- </container>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen>
-
- <screen name="Notes">
- <section>
- <actions>
- <set field="parameters.partyId" from-field="userLogin.partyId"/>
- <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>
- <section>
- <condition>
- <not><if-empty field="party"/></not>
- </condition>
- <widgets>
- <section>
- <widgets>
- <include-screen name="Notes" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- </widgets>
- </section>
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
- </container>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen>
-
- <screen name="mytasksParty">
- <section>
- <actions>
- <set field="parameters.partyId" from-field="userLogin.partyId"/>
- <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>
- <section>
- <condition>
- <not><if-empty field="party"/></not>
- </condition>
- <widgets>
- <section>
- <widgets>
- <include-screen name="mytasks" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- </widgets>
- </section>
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
- </container>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen>
-
- <screen name="ViewInternalOrg">
- <section>
- <actions>
- <set field="parameters.partyId" from-field="userLogin.partyId"/>
- <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>
- <section>
- <condition>
- <not><if-empty field="party"/></not>
- </condition>
- <widgets>
- <section>
- <widgets>
- <include-screen name="ViewInternalOrg" location="component://party/widget/partymgr/ProfileScreens.xml"/>
- </widgets>
- </section>
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
- </container>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen>
-
- <screen name="CreateUserNotification">
- <section>
- <actions>
- <set field="title" value="${uiLabelMap.MyPageCustRequestNotificationMailCreation}"/>
- </actions>
- <widgets>
- <platform-specific><html><html-template location="component://party/templates/email/CreatePartyNotification.ftl"/></html></platform-specific>
- </widgets>
- </section>
- </screen>
-
</screens>