You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ak...@apache.org on 2017/11/25 09:25:42 UTC
svn commit: r1816276 - in /ofbiz/branches/release16.11: ./
applications/party/webapp/partymgr/WEB-INF/controller.xml
applications/party/widget/partymgr/PartyMenus.xml
applications/party/widget/partymgr/PartyScreens.xml
Author: akashjain
Date: Sat Nov 25 09:25:42 2017
New Revision: 1816276
URL: http://svn.apache.org/viewvc?rev=1816276&view=rev
Log:
Applied fix from trunk for revision: 1816273
===
Fixed: Create Related Account from Contact Profile redirect to empty profile screen, applied patch from jira issue (OFBIZ-9697)
Thanks, Ankit Joshi for your contribution.
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
Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 25 09:25:42 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
+/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
/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=1816276&r1=1816275&r2=1816276&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 Sat Nov 25 09:25:42 2017
@@ -57,6 +57,7 @@ under the License.
<request-map uri="editPartyInvitation"><security https="true" auth="true"/><response name="success" type="view" value="editPartyInvitation"/></request-map>
<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="createPartyInvitation">
<security https="true" auth="true"/>
@@ -419,7 +420,7 @@ under the License.
<request-map uri="createPartyAttribute">
<security https="true" auth="true"/>
<event type="service" path="" invoke="createPartyAttribute"/>
- <response name="success" type="view" value="viewprofile"/>
+ <response name="success" type="request" value="backHome"/>
<response name="error" type="view" value="EditPartyAttribute"/>
</request-map>
<request-map uri="updatePartyAttribute">
@@ -1410,6 +1411,7 @@ under the License.
<view-map name="Preferences" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#Preferences"/>
<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="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=1816276&r1=1816275&r2=1816276&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyMenus.xml Sat Nov 25 09:25:42 2017
@@ -729,7 +729,7 @@
<menu name="AddRelContactAccounts">
<menu-item name="add" title="${uiLabelMap.CommonCreateNew}">
- <link target="${parameters._LAST_VIEW_NAME_}">
+ <link target="AddPartyRelatedAccount">
<parameter param-name="partyId"/>
<parameter param-name="portalPageId"/>
<parameter param-name="editPartyRel" value="Y"/>
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=1816276&r1=1816275&r2=1816276&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyScreens.xml Sat Nov 25 09:25:42 2017
@@ -567,6 +567,27 @@ under the License.
</widgets>
</section>
</screen>
+
+ <screen name="CreatePartyRelatedAccount">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PartyAddRelatedAccount"/>
+ <set field="tabButtonItem" value="viewprofile"/>
+ <set field="labelTitleProperty" value="PartyAddRelatedAccount"/>
+ <set field="partyId" from-field="parameters.partyId"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet title="${uiLabelMap.PartyAddRelatedAccount}">
+ <include-form name="AddAccount" location="component://party/widget/partymgr/PartyForms.xml"/>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="EditUserLoginSecurityGroups">
<section>
<actions>