You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2017/11/26 09:23:28 UTC
svn commit: r1816374 - in /ofbiz/branches/release16.11: ./
applications/party/webapp/partymgr/WEB-INF/
applications/party/widget/partymgr/
Author: jleroux
Date: Sun Nov 26 09:23:28 2017
New Revision: 1816374
URL: http://svn.apache.org/viewvc?rev=1816374&view=rev
Log:
"Applied fix from trunk framework for revision: 1816373 "
------------------------------------------------------------------------
r1816373 | jleroux | 2017-11-26 10:22:59 +0100 (dim., 26 nov. 2017) | 14 lines
Fixed: No option to create the account contacts in SFA component
(OFBIZ-10010)
Steps to regenerate:
1) Open URL https://demo-trunk.ofbiz.apache.org/sfa/control/FindAccounts
2) Select an account from the list or create a new account.
3) In the account profile page, click on "Create New" in the "List Related Contacts" section.
Actual: No option to create the account contacts.
Expected: There should be an option to create account's contact.
Creates new request-map and screen definition to redirect 'Create New' link
on proper screen. So that user can add contacts to the Account.
Thanks: Rubia Elza Joshep for report and Pradeep Choudhary for patch
------------------------------------------------------------------------
Modified:
ofbiz/branches/release16.11/ (props changed)
ofbiz/branches/release16.11/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyMenus.xml
ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyScreens.xml
ofbiz/branches/release16.11/applications/party/widget/partymgr/ProfileScreens.xml
Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 26 09:23:28 2017
@@ -10,5 +10,5 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291,1816297,1816369
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291,1816297,1816369,1816373
/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520
Modified: ofbiz/branches/release16.11/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1816374&r1=1816373&r2=1816374&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release16.11/applications/party/webapp/partymgr/WEB-INF/controller.xml Sun Nov 26 09:23:28 2017
@@ -58,7 +58,8 @@ under the License.
<request-map uri="PartyInvitationGroupAssocs"><security https="true" auth="true"/><response name="success" type="view" value="PartyInvitationGroupAssocs"/></request-map>
<request-map uri="PartyInvitationRoleAssocs"><security https="true" auth="true"/><response name="success" type="view" value="PartyInvitationRoleAssocs"/></request-map>
<request-map uri="AddPartyRelatedAccount"><security https="true" auth="true"/><response name="success" type="view" value="AddPartyRelatedAccount"/></request-map>
- <!--Party Invitation Services-->
+ <request-map uri="AddAccountRelatedContact"><security https="true" auth="true"/><response name="success" type="view" value="AddAccountRelatedContact"/></request-map>
+ <!--Party Invitation Services-->
<request-map uri="createPartyInvitation">
<security https="true" auth="true"/>
<event type="service" invoke="createPartyInvitation"/>
@@ -1412,6 +1413,7 @@ under the License.
<view-map name="PartyGeoLocation" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#PartyGeoLocation"/>
<view-map name="GetPartyGeoLocation" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#GetPartyGeoLocation"/>
<view-map name="AddPartyRelatedAccount" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#CreatePartyRelatedAccount"/>
+ <view-map name="AddAccountRelatedContact" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#CreateAccountRelatedContact"/>
<view-map name="UpdateCommOrders" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#UpdateCommOrders"/>
<view-map name="UpdateCommProducts" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#UpdateCommProducts"/>
Modified: ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyMenus.xml?rev=1816374&r1=1816373&r2=1816374&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyMenus.xml Sun Nov 26 09:23:28 2017
@@ -737,6 +737,16 @@
</menu-item>
</menu>
+ <menu name="AddRelAccountContacts">
+ <menu-item name="add" title="${uiLabelMap.CommonCreateNew}">
+ <link target="AddAccountRelatedContact">
+ <parameter param-name="partyId"/>
+ <parameter param-name="portalPageId"/>
+ <parameter param-name="editPartyRel" value="Y"/>
+ </link>
+ </menu-item>
+ </menu>
+
<menu name="NewPartyIdentification">
<menu-item name="new" title="${uiLabelMap.CommonNew}">
<link target="viewidentifications">
Modified: ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyScreens.xml?rev=1816374&r1=1816373&r2=1816374&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyScreens.xml Sun Nov 26 09:23:28 2017
@@ -587,7 +587,27 @@ under the License.
</widgets>
</section>
</screen>
-
+
+ <screen name="CreateAccountRelatedContact">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PartyAddRelatedAccount"/>
+ <set field="tabButtonItem" value="viewprofile"/>
+ <set field="labelTitleProperty" value="PartyAddRelatedContact"/>
+ <set field="partyId" from-field="parameters.partyId"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet title="${uiLabelMap.PartyAddRelatedContact}">
+ <include-form name="AddContact" location="component://party/widget/partymgr/PartyForms.xml"/>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="EditUserLoginSecurityGroups">
<section>
<actions>
Modified: ofbiz/branches/release16.11/applications/party/widget/partymgr/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/party/widget/partymgr/ProfileScreens.xml?rev=1816374&r1=1816373&r2=1816374&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/branches/release16.11/applications/party/widget/partymgr/ProfileScreens.xml Sun Nov 26 09:23:28 2017
@@ -524,8 +524,8 @@
<if-compare field="party.partyTypeId" operator="equals" value="PARTY_GROUP"/>
</condition>
<widgets>
- <screenlet title="${uiLabelMap.PartyListRelatedContacts}" navigation-menu-name="AddRelContactAccounts">
- <include-menu name="AddRelContactAccounts" location="component://party/widget/partymgr/PartyMenus.xml"/>
+ <screenlet title="${uiLabelMap.PartyListRelatedContacts}" navigation-menu-name="AddRelAccountContacts">
+ <include-menu name="AddRelAccountContacts" location="component://party/widget/partymgr/PartyMenus.xml"/>
<section>
<condition>
<not><if-empty field="parameters.editPartyRel"/></not>