Author: hansbak
Date: Tue Jul 28 09:39:09 2009
New Revision: 798474
URL: http://svn.apache.org/viewvc?rev=798474&view=rev
Log:
added an addscreen inline for the related contact/account portlets and show in
myportal too
Modified:
ofbiz/trunk/applications/party/data/PartyPortletData.xml
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
Modified: ofbiz/trunk/applications/party/data/PartyPortletData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyPortletData.xml?rev=798474&r1=798473&r2=798474&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/data/PartyPortletData.xml (original)
+++ ofbiz/trunk/applications/party/data/PartyPortletData.xml Tue Jul 28
09:39:09 2009
@@ -132,9 +132,9 @@
<PortalPageColumn portalPageId="PartyProfile" columnSeqId="00002"/><!-- no
width in pixels or percent, use the rest of the space available -->
<PortalPagePortlet portalPageId="PartyProfile" portalPortletId="party"
portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
- <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="contact"
portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
- <PortalPagePortlet portalPageId="PartyProfile"
portalPortletId="partyRelContacts" portletSeqId="00001" columnSeqId="00001"
sequenceNum="2"/>
- <PortalPagePortlet portalPageId="PartyProfile"
portalPortletId="partyRelAccounts" portletSeqId="00001" columnSeqId="00001"
sequenceNum="3"/>
+ <PortalPagePortlet portalPageId="PartyProfile"
portalPortletId="partyRelContacts" portletSeqId="00001" columnSeqId="00001"
sequenceNum="1"/>
+ <PortalPagePortlet portalPageId="PartyProfile"
portalPortletId="partyRelAccounts" portletSeqId="00001" columnSeqId="00001"
sequenceNum="2"/>
+ <PortalPagePortlet portalPageId="PartyProfile" portalPortletId="contact"
portletSeqId="00001" columnSeqId="00001" sequenceNum="3"/>
<PortalPagePortlet portalPageId="PartyProfile"
portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001"
sequenceNum="4"/>
<PortalPagePortlet portalPageId="PartyProfile"
portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001"
sequenceNum="5"/>
<PortalPagePortlet portalPageId="PartyProfile" portalPortletId="UserLogin"
portletSeqId="00001" columnSeqId="00002" sequenceNum="1"/>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=798474&r1=798473&r2=798474&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Tue
Jul 28 09:39:09 2009
@@ -665,8 +665,8 @@
<request-map uri="createPartyRelationshipContactAccount">
<security https="true" auth="true"/>
<event type="service" path=""
invoke="createPartyRelationshipContactAccount"/>
- <response name="success" type="view" value="EditPartyRelationships"/>
- <response name="error" type="view" value="EditPartyRelationships"/>
+ <response name="success" type="view-home"/>
+ <response name="error" type="view-home"/>
</request-map>
<request-map uri="updatePartyRelationship">
<security https="true" auth="true"/>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=798474&r1=798473&r2=798474&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Tue Jul 28
09:39:09 2009
@@ -651,4 +651,10 @@
</menu-item>
</menu>
+ <menu name="addRelContactAccounts">
+ <menu-item name="add" title="${uiLabelMap.CommonCreateNew}">
+ <link
target="${parameters._LAST_VIEW_NAME_}?portalPageId=${parameters.portalPageId}&partyId=${parameters.partyId}&editPartyRel=Y"/>
+ </menu-item>
+ </menu>
+
</menus>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=798474&r1=798473&r2=798474&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Tue Jul 28
09:39:09 2009
@@ -269,21 +269,6 @@
<container style="lefthalf">
<section>
<condition>
- <if-compare field="party.partyTypeId"
operator="equals" value="PERSON"/>
- </condition>
- <widgets>
- <screenlet
title="${uiLabelMap.PartyAddRelatedAccount}">
- <include-form name="AddAccount"
location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- </screenlet>
- </widgets>
- <fail-widgets>
- <screenlet
title="${uiLabelMap.PartyAddRelatedContact}">
- <include-form name="AddContact"
location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- </screenlet>
- </fail-widgets>
- </section>
- <section>
- <condition>
<if-has-permission permission="PARTYMGR"
action="_CREATE"/>
</condition>
<widgets>
Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=798474&r1=798473&r2=798474&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Tue Jul
28 09:39:09 2009
@@ -479,6 +479,7 @@
<screen name="partyRelContacts">
<section>
<actions>
+ <entity-one entity-name="Party"
value-field="party"></entity-one>
<entity-and list="contacts" entity-name="PartyRelationship"
filter-by-date="true">
<field-map field-name="partyIdFrom"
from-field="parameters.partyId"/>
<field-map field-name="roleTypeIdFrom" value="ACCOUNT"/>
@@ -489,10 +490,19 @@
<widgets>
<section>
<condition>
- <not><if-empty field="contacts"/></not>
+ <if-compare field="party.partyTypeId"
operator="equals" value="PARTY_GROUP"/>
</condition>
<widgets>
- <screenlet
title="${uiLabelMap.PartyListRelatedContacts}"
navigation-form-name="ListContacts">
+ <screenlet
title="${uiLabelMap.PartyListRelatedContacts}"
navigation-menu-name="addRelContactAccounts">
+ <include-menu name="addRelContactAccounts"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <section>
+ <condition>
+ <not><if-empty
field="parameters.editPartyRel"/></not>
+ </condition>
+ <widgets>
+ <include-form name="AddContact"
location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </widgets>
+ </section>
<include-form name="ListRelatedContacts"
location="component://party/webapp/partymgr/party/PartyForms.xml"/>
</screenlet>
</widgets>
@@ -514,11 +524,20 @@
<widgets>
<section>
<condition>
- <not><if-empty field="accounts"/></not>
+ <if-compare field="party.partyTypeId"
operator="equals" value="PERSON"/>
</condition>
- <widgets>
- <screenlet
title="${uiLabelMap.PartyListRelatedAccounts}"
navigation-form-name="ListAccounts">
- <include-form name="ListRelatedAccounts"
location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <widgets>
+ <screenlet
title="${uiLabelMap.PartyListRelatedAccounts}"
navigation-menu-name="addRelContactAccounts">
+ <include-menu name="addRelContactAccounts"
location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <section>
+ <condition>
+ <not><if-empty
field="parameters.editPartyRel"/></not>
+ </condition>
+ <widgets>
+ <include-form name="AddAccount"
location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </widgets>
+ </section>
+ <include-form name="ListRelatedAccounts"
location="component://party/webapp/partymgr/party/PartyForms.xml"/>
</screenlet>
</widgets>
</section>
Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=798474&r1=798473&r2=798474&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Tue Jul 28
09:39:09 2009
@@ -83,17 +83,19 @@
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE0"
portalPortletId="INCOM_CUST_REQUESTS" portletSeqId="00001" columnSeqId="00001"
sequenceNum="0"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE0"
portalPortletId="MyCommunications" portletSeqId="00001" columnSeqId="00001"
sequenceNum="1"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="party" portletSeqId="00001" columnSeqId="00001"
sequenceNum="0"/>
- <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="contact" portletSeqId="00001" columnSeqId="00001"
sequenceNum="1"/>
- <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001"
sequenceNum="2"/>
- <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001"
sequenceNum="3"/>
- <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001"
sequenceNum="4"/>
- <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002"
sequenceNum="5"/>
- <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002"
sequenceNum="6"/>
- <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002"
sequenceNum="7"/>
- <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="Content" portletSeqId="00001" columnSeqId="00002"
sequenceNum="8"/>
- <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002"
sequenceNum="9"/>
- <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002"
sequenceNum="10"/>
- <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002"
sequenceNum="11"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="partyRelContacts" portletSeqId="00001" columnSeqId="00001"
sequenceNum="1"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="partyRelAccounts" portletSeqId="00001" columnSeqId="00001"
sequenceNum="2"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="contact" portletSeqId="00001" columnSeqId="00001"
sequenceNum="3"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001"
sequenceNum="4"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001"
sequenceNum="5"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001"
sequenceNum="6"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002"
sequenceNum="1"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002"
sequenceNum="2"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002"
sequenceNum="3"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="Content" portletSeqId="00001" columnSeqId="00002"
sequenceNum="4"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="ShipperAccount" portletSeqId="00001" columnSeqId="00002"
sequenceNum="5"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="Notes" portletSeqId="00001" columnSeqId="00002"
sequenceNum="6"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1"
portalPortletId="MYTASKSPARTY" portletSeqId="00001" columnSeqId="00002"
sequenceNum="7"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE2"
portalPortletId="MyCommunications" portletSeqId="00001" columnSeqId="00001"
sequenceNum="0"/>
<PortletAttribute portalPageId="MYPORTAL_EMPLOYEE2"
portalPortletId="MyCommunications" portletSeqId="00001"
attrName="communicationPartyId" attrValue="Company"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE4"
portalPortletId="mytimesheet" portletSeqId="00001" columnSeqId="00001"
sequenceNum="0"/>
@@ -105,7 +107,9 @@
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML0"
portalPortletId="INCOM_CUST_REQUESTS" portletSeqId="00001" columnSeqId="00001"
sequenceNum="1"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML0"
portalPortletId="MyCommunications" portletSeqId="00001" columnSeqId="00001"
sequenceNum="2"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1"
portalPortletId="party" portletSeqId="00001" columnSeqId="00001"
sequenceNum="0"/>
- <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1"
portalPortletId="contact" portletSeqId="00001" columnSeqId="00001"
sequenceNum="1"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1"
portalPortletId="partyRelContacts" portletSeqId="00001" columnSeqId="00001"
sequenceNum="1"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1"
portalPortletId="partyRelAccounts" portletSeqId="00001" columnSeqId="00001"
sequenceNum="2"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1"
portalPortletId="contact" portletSeqId="00001" columnSeqId="00001"
sequenceNum="3"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1"
portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002"
sequenceNum="2"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1"
portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002"
sequenceNum="3"/>
<PortalPagePortlet portalPageId="MYPORTAL_EMPL-NOEML1"
portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002"
sequenceNum="4"/>
@@ -132,9 +136,11 @@
<PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER"
portalPortletId="MyCommunications" portletSeqId="00001" columnSeqId="00001"
sequenceNum="6"/>
<PortletAttribute portalPageId="MYPORTAL_CUSTOMER"
portalPortletId="MyCommunications" portletSeqId="00001"
attrName="internalNotesOnly" attrValue="Y"/>
- <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1"
portalPortletId="party" portletSeqId="00001" columnSeqId="00001"
sequenceNum="6"/>
- <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1"
portalPortletId="contact" portletSeqId="00001" columnSeqId="00001"
sequenceNum="8"/>
- <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1"
portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001"
sequenceNum="10"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1"
portalPortletId="party" portletSeqId="00001" columnSeqId="00001"
sequenceNum="1"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1"
portalPortletId="partyRelContacts" portletSeqId="00001" columnSeqId="00001"
sequenceNum="2"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1"
portalPortletId="partyRelAccounts" portletSeqId="00001" columnSeqId="00001"
sequenceNum="3"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1"
portalPortletId="contact" portletSeqId="00001" columnSeqId="00001"
sequenceNum="4"/>
+ <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1"
portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001"
sequenceNum="5"/>
<PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1"
portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002"
sequenceNum="3"/>
<PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1"
portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002"
sequenceNum="4"/>
<PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1"
portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002"
sequenceNum="5"/>
