OFBiz › OFBiz - Commits

svn commit: r1825235 - in /ofbiz/branches/release16.11: ./ applications/marketing/webapp/sfa/WEB-INF/ applications/marketing/widget/sfa/ applications/marketing/widget/sfa/forms/ applications/party/groovyScripts/party/ applications/party/template/party/...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

Arun Patidar-4

svn commit: r1825235 - in /ofbiz/branches/release16.11: ./ applications/marketing/webapp/sfa/WEB-INF/ applications/marketing/widget/sfa/ applications/marketing/widget/sfa/forms/ applications/party/groovyScripts/party/ applications/party/template/party/...

Author: arunpatidar
Date: Sat Feb 24 12:44:24 2018
New Revision: 1825235

URL: http://svn.apache.org/viewvc?rev=1825235&view=rev
Log:
Applied fix from trunk for revision: 1825233
===

Fixed: Incorrect Party profile view redirection in SFA due to missing roleType.
(OFBIZ-10121)
Thanks Ankit Joshi for your contribution.

Modified:
ofbiz/branches/release16.11/ (props changed)
ofbiz/branches/release16.11/applications/marketing/webapp/sfa/WEB-INF/controller.xml
ofbiz/branches/release16.11/applications/marketing/widget/sfa/CommonScreens.xml
ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/AccountForms.xml
ofbiz/branches/release16.11/applications/party/groovyScripts/party/SetRoleVars.groovy
ofbiz/branches/release16.11/applications/party/template/party/profileblocks/Attributes.ftl
ofbiz/branches/release16.11/applications/party/template/party/profileblocks/Notes.ftl
ofbiz/branches/release16.11/applications/party/template/party/profileblocks/UserLogin.ftl
ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyMenus.xml

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 24 12:44:24 2018
@@ -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,1801349-1801350,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,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291,
1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192
+/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,1801349-1801350,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,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291,
1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825233
/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/marketing/webapp/sfa/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/marketing/webapp/sfa/WEB-INF/controller.xml?rev=1825235&r1=1825234&r2=1825235&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/marketing/webapp/sfa/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release16.11/applications/marketing/webapp/sfa/WEB-INF/controller.xml Sat Feb 24 12:44:24 2018
@@ -64,6 +64,14 @@ under the License.
</request-map>


+ <request-map uri="ViewAccountProfile">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ViewAccountProfile" save-home-view="true"/>
+ </request-map>
+ <request-map uri="ViewAccountLeadProfile">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ViewAccountLeadProfile" save-home-view="true"/>
+ </request-map>
<request-map uri="FindAccounts">
<security https="true" auth="true"/>
<response name="success" type="view" value="FindAccounts" save-home-view="true"/>
@@ -84,6 +92,10 @@ under the License.
</request-map>


+ <request-map uri="ViewLeadProfile">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ViewLeadProfile" save-home-view="true"/>
+ </request-map>
<request-map uri="FindLeads">
<security https="true" auth="true"/>
<response name="success" type="view" value="FindLeads" save-home-view="true"/>
@@ -156,6 +168,10 @@ under the License.
<response name="success" type="view" value="AddRelatedCompany"/>
</request-map>

+ <request-map uri="ViewContactProfile">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ViewContactProfile" save-home-view="true"/>
+ </request-map>
<request-map uri="FindContacts">
<security https="true" auth="true"/>
<response name="success" type="view" value="FindContacts" save-home-view="true"/>
@@ -281,6 +297,10 @@ under the License.



+ <view-map name="ViewLeadProfile" type="screen" page="component://marketing/widget/sfa/CommonScreens.xml#ViewLeadProfile"/>
+ <view-map name="ViewAccountProfile" type="screen" page="component://marketing/widget/sfa/CommonScreens.xml#ViewAccountProfile"/>
+ <view-map name="ViewContactProfile" type="screen" page="component://marketing/widget/sfa/CommonScreens.xml#ViewContactProfile"/>
+ <view-map name="ViewAccountLeadProfile" type="screen" page="component://marketing/widget/sfa/CommonScreens.xml#ViewAccountLeadProfile"/>
<view-map name="main" type="screen" page="component://marketing/widget/sfa/CommonScreens.xml#main"/>
<view-map name="viewprofile" type="screen" page="component://marketing/widget/sfa/CommonScreens.xml#ViewProfile"/>
<view-map name="ViewPartiesCreatedByVCard" type="screen" page="component://marketing/widget/sfa/CommonScreens.xml#ViewPartiesCreatedByVCard"/>

Modified: ofbiz/branches/release16.11/applications/marketing/widget/sfa/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/marketing/widget/sfa/CommonScreens.xml?rev=1825235&r1=1825234&r2=1825235&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/marketing/widget/sfa/CommonScreens.xml (original)
+++ ofbiz/branches/release16.11/applications/marketing/widget/sfa/CommonScreens.xml Sat Feb 24 12:44:24 2018
@@ -347,6 +347,304 @@ under the License.
</widgets>
</section>
</screen>
+ <screen name="ViewLeadProfile">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleViewPartyProfile"/>
+ <set field="tabButtonItem" value="profile"/>
+ <set field="labelTitleProperty" value="PartyTaxAuthInfos"/>
+ <set field="parameters.roleTypeId" value="LEAD"/>
+
+ <set field="layoutSettings.javaScripts[]" value="/partymgr/static/PartyProfileContent.js" global="true"/>
+
+ <script location="component://party/groovyScripts/party/ViewProfile.groovy"/>
+ <script location="component://party/groovyScripts/party/SetRoleVars.groovy"/>
+ <set field="parameters.partyId" from-field="partyId"/>
+ <set field="parameters.partyGroupId" from-field="partyGroupId"/>
+ <set field="DONE_PAGE" value="ViewLeadProfile"/>
+ </actions>
+ <widgets>
+ <include-screen name="LeadProfile"/>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="ViewContactProfile">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleViewPartyProfile"/>
+ <set field="tabButtonItem" value="profile"/>
+ <set field="labelTitleProperty" value="PartyTaxAuthInfos"/>
+ <set field="parameters.roleTypeId" value="CONTACT"/>
+
+ <set field="layoutSettings.javaScripts[]" value="/partymgr/static/PartyProfileContent.js" global="true"/>
+
+ <script location="component://party/groovyScripts/party/ViewProfile.groovy"/>
+ <script location="component://party/groovyScripts/party/SetRoleVars.groovy"/>
+ <set field="parameters.partyId" from-field="partyId"/>
+ <set field="parameters.partyGroupId" from-field="partyGroupId"/>
+ <set field="DONE_PAGE" value="ViewContactProfile"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <not><if-empty field="party"/></not>
+ </condition>
+ <widgets>
+ <section>
+ <condition>
+ <if-compare field="showOld" operator="equals" value="true" type="Boolean"/>
+ </condition>
+ <widgets>
+ <container style="button-bar button-style-2">
+ <link target="ViewContactProfile" text="${uiLabelMap.PartyHideOld}">
+ <parameter param-name="partyId" from-field="party.partyId"/>
+ </link>
+ </container>
+ </widgets>
+ <fail-widgets>
+ <container style="button-bar button-style-2">
+ <link target="ViewContactProfile" text="${uiLabelMap.PartyShowOld}">
+ <parameter param-name="partyId" from-field="party.partyId"/>
+ <parameter param-name="SHOW_OLD" value="true"/>
+ </link>
+ </container>
+ </fail-widgets>
+ </section>
+ <section>
+ <condition>
+ <not><if-empty field="contactDescription"/></not>
+ </condition>
+ <widgets>
+ <container style="profile-left">
+ <include-screen name="Party" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="partyRelAccounts" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Contact" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ </container>
+ <container style="profile-right">
+ <section>
+ <actions>
+ <set field="parameters.partyId" from-field="partyId"/>
+ </actions>
+ </section>
+ <include-screen name="UserLogin" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Attributes" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Visits" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Subscriptions" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Content" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Notes" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ </container>
+ </widgets>
+ </section>
+ </widgets>
+ <fail-widgets>
+ <container>
+ <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
+ </container>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="ViewAccountProfile">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleViewPartyProfile"/>
+ <set field="tabButtonItem" value="profile"/>
+ <set field="labelTitleProperty" value="PartyTaxAuthInfos"/>
+ <set field="parameters.roleTypeId" value="ACCOUNT"/>
+ <set field="layoutSettings.javaScripts[]" value="/partymgr/static/PartyProfileContent.js" global="true"/>
+
+ <script location="component://party/groovyScripts/party/ViewProfile.groovy"/>
+ <script location="component://party/groovyScripts/party/SetRoleVars.groovy"/>
+ <set field="parameters.partyId" from-field="partyId"/>
+ <set field="parameters.partyGroupId" from-field="partyGroupId"/>
+ <set field="DONE_PAGE" value="ViewAccountProfile"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <not><if-empty field="party"/></not>
+ </condition>
+ <widgets>
+ <section>
+ <condition>
+ <if-compare field="showOld" operator="equals" value="true" type="Boolean"/>
+ </condition>
+ <widgets>
+ <container style="button-bar button-style-2">
+ <link target="ViewAccountProfile" text="${uiLabelMap.PartyHideOld}">
+ <parameter param-name="partyId" from-field="party.partyId"/>
+ </link>
+ </container>
+ </widgets>
+ <fail-widgets>
+ <container style="button-bar button-style-2">
+ <link target="ViewAccountProfile" text="${uiLabelMap.PartyShowOld}">
+ <parameter param-name="partyId" from-field="party.partyId"/>
+ <parameter param-name="SHOW_OLD" value="true"/>
+ </link>
+ </container>
+ </fail-widgets>
+ </section>
+ <section>
+ <condition>
+ <not><if-empty field="accountDescription"/></not>
+ </condition>
+ <widgets>
+ <container style="profile-left">
+ <include-screen name="Party" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="partyRelContacts" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Contact" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ </container>
+ <container style="profile-right">
+ <include-screen name="FinAccounts" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Attributes" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="PaymentMethods" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="LeadPartyDataSource" location="component://marketing/widget/sfa/LeadScreens.xml"/>
+ </container>
+ <container style="profile-bottom">
+ <include-screen name="PartySalesOpportunities" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Notes" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Content" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ </container>
+ </widgets>
+ </section>
+ </widgets>
+ <fail-widgets>
+ <container>
+ <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
+ </container>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="ViewAccountLeadProfile">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleViewPartyProfile"/>
+ <set field="tabButtonItem" value="profile"/>
+ <set field="labelTitleProperty" value="PartyTaxAuthInfos"/>
+ <set field="parameters.roleTypeId" value="ACCOUNT_LEAD"/>
+
+ <set field="layoutSettings.javaScripts[]" value="/partymgr/static/PartyProfileContent.js" global="true"/>
+
+ <script location="component://party/groovyScripts/party/ViewProfile.groovy"/>
+ <script location="component://party/groovyScripts/party/SetRoleVars.groovy"/>
+ <set field="parameters.partyId" from-field="partyId"/>
+ <set field="parameters.partyGroupId" from-field="partyGroupId"/>
+ <set field="DONE_PAGE" value="ViewAccountLeadProfile"/>
+ </actions>
+ <widgets>
+ <include-screen name="LeadProfile"/>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="LeadProfile">
+ <section>
+ <widgets>
+ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <not><if-empty field="party"/></not>
+ </condition>
+ <widgets>
+ <section>
+ <condition>
+ <if-compare field="showOld" operator="equals" value="true" type="Boolean"/>
+ </condition>
+ <widgets>
+ <container style="button-bar button-style-2">
+ <link target="ViewAccountLeadProfile" text="${uiLabelMap.PartyHideOld}">
+ <parameter param-name="partyId" from-field="party.partyId"/>
+ </link>
+ </container>
+ </widgets>
+ <fail-widgets>
+ <container style="button-bar button-style-2">
+ <link target="ViewAccountLeadProfile" text="${uiLabelMap.PartyShowOld}">
+ <parameter param-name="partyId" from-field="party.partyId"/>
+ <parameter param-name="SHOW_OLD" value="true"/>
+ </link>
+ </container>
+ </fail-widgets>
+ </section>
+ <section>
+ <condition>
+ <and>
+ <or>
+ <not><if-empty field="leadDescription"/></not>
+ <not><if-empty field="accountLeadDescription"/></not>
+ </or>
+ </and>
+ </condition>
+ <widgets>
+ <container style="profile-left">
+ <section>
+ <actions>
+ <set field="parameters.partyId" from-field="partyId"/>
+ </actions>
+ <widgets>
+ <include-screen name="Party" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ </widgets>
+ </section>
+ <section>
+ <condition>
+ <not><if-empty field="partyGroupId"/></not>
+ </condition>
+ <actions>
+ <set field="parameters.partyId" from-field="partyGroupId"/>
+ </actions>
+ <widgets>
+ <include-screen name="Party" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="partyRelContacts" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ </widgets>
+ </section>
+ <section>
+ <actions>
+ <set field="parameters.partyId" from-field="partyId"/>
+ </actions>
+ <widgets>
+ <include-screen name="Contact" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="LeadPartyDataSource" location="component://marketing/widget/sfa/LeadScreens.xml"/>
+ </widgets>
+ </section>
+ </container>
+ <container style="profile-right">
+ <section>
+ <actions>
+ <set field="parameters.partyId" from-field="partyId"/>
+ </actions>
+ <widgets>
+ <include-screen name="Content" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="Notes" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ <include-screen name="PartySalesOpportunities" location="component://party/widget/partymgr/ProfileScreens.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </widgets>
+ </section>
+ </widgets>
+ <fail-widgets>
+ <container>
+ <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
+ </container>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="ViewPartiesCreatedByVCard">
<section>
<widgets>

Modified: ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/AccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/AccountForms.xml?rev=1825235&r1=1825234&r2=1825235&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/AccountForms.xml (original)
+++ ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/AccountForms.xml Sat Feb 24 12:44:24 2018
@@ -137,10 +137,24 @@ under the License.
<set field="relatedCompanyPartyId" from-field="relatedCompanies[0].partyIdFrom" type="Object"/>
<set field="existRelationship" from-field="existRelationships[0]"/>
</row-actions>
- <field name="partyId" title="${uiLabelMap.PartyPartyId}">
- <hyperlink description="${partyName} [${partyId}]" target="viewprofile" >
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when="roleTypeId!=null&${roleTypeId=='ACCOUNT'}">
+ <hyperlink description="${partyName} [${partyId}]" target="ViewAccountProfile">
+ <parameter param-name="partyId"/>
+ </hyperlink>
+ </field>
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when="roleTypeId!=null&${roleTypeId=='CONTACT'}">
+ <hyperlink description="${partyName} [${partyId}]" target="ViewContactProfile">
+ <parameter param-name="partyId"/>
+ </hyperlink>
+ </field>
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when="roleTypeId!=null&${roleTypeId=='LEAD'}">
+ <hyperlink description="${partyName} [${partyId}]" target="ViewLeadProfile">
+ <parameter param-name="partyId"/>
+ </hyperlink>
+ </field>
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when="roleTypeId!=null&${roleTypeId=='ACCOUNT_LEAD'}">
+ <hyperlink description="${partyName} [${partyId}]" target="ViewAccountLeadProfile">
<parameter param-name="partyId"/>
- <parameter param-name="roleTypeId"/>
</hyperlink>
</field>
<field name="emailAddress"><display description="${emailAddresses[0].infoString}"/></field>

Modified: ofbiz/branches/release16.11/applications/party/groovyScripts/party/SetRoleVars.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/party/groovyScripts/party/SetRoleVars.groovy?rev=1825235&r1=1825234&r2=1825235&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/party/groovyScripts/party/SetRoleVars.groovy (original)
+++ ofbiz/branches/release16.11/applications/party/groovyScripts/party/SetRoleVars.groovy Sat Feb 24 12:44:24 2018
@@ -32,7 +32,7 @@ if (roleTypeAndParty) {
context.partyId = parameters.partyId
}
} else if ("ACCOUNT_LEAD".equals(roleTypeId)) {
- context.leadDescription = roleTypeAndParty.description
+ context.accountLeadDescription = roleTypeAndParty.description
partyRelationships = from("PartyRelationship").where("partyIdFrom", parameters.partyId, "roleTypeIdFrom", "ACCOUNT_LEAD", "roleTypeIdTo", "LEAD", "partyRelationshipTypeId", "EMPLOYMENT").filterByDate().queryFirst()
if (partyRelationships) {
context.partyGroupId = parameters.partyId

Modified: ofbiz/branches/release16.11/applications/party/template/party/profileblocks/Attributes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/party/template/party/profileblocks/Attributes.ftl?rev=1825235&r1=1825234&r2=1825235&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/party/template/party/profileblocks/Attributes.ftl (original)
+++ ofbiz/branches/release16.11/applications/party/template/party/profileblocks/Attributes.ftl Sat Feb 24 12:44:24 2018
@@ -22,7 +22,7 @@ under the License.
<ul>
<li class="h3">${uiLabelMap.PartyAttributes}</li>
<#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
- <li><a href="<@ofbizUrl>editPartyAttribute?partyId=${party.partyId!}</@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
+ <li><a href="<@ofbizUrl>editPartyAttribute?partyId=${party.partyId!}&CANCEL_PAGE=${DONE_PAGE!}</@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
</#if>
</ul>
<br class="clear"/>

Modified: ofbiz/branches/release16.11/applications/party/template/party/profileblocks/Notes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/party/template/party/profileblocks/Notes.ftl?rev=1825235&r1=1825234&r2=1825235&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/party/template/party/profileblocks/Notes.ftl (original)
+++ ofbiz/branches/release16.11/applications/party/template/party/profileblocks/Notes.ftl Sat Feb 24 12:44:24 2018
@@ -22,7 +22,7 @@ under the License.
<ul>
<li class="h3">${uiLabelMap.CommonNotes}</li>
<#if security.hasEntityPermission("PARTYMGR", "_NOTE", session)>
- <li><a href="<@ofbizUrl>AddPartyNote?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
+ <li><a href="<@ofbizUrl>AddPartyNote?partyId=${partyId}&DONE_PAGE=${DONE_PAGE!}</@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
</#if>
</ul>
<br class="clear" />

Modified: ofbiz/branches/release16.11/applications/party/template/party/profileblocks/UserLogin.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/party/template/party/profileblocks/UserLogin.ftl?rev=1825235&r1=1825234&r2=1825235&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/party/template/party/profileblocks/UserLogin.ftl (original)
+++ ofbiz/branches/release16.11/applications/party/template/party/profileblocks/UserLogin.ftl Sat Feb 24 12:44:24 2018
@@ -22,7 +22,7 @@ under the License.
<ul>
<li class="h3">${uiLabelMap.PartyUserName}</li>
<#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
- <li><a href="<@ofbizUrl>ProfileCreateNewLogin?partyId=${party.partyId}</@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
+ <li><a href="<@ofbizUrl>ProfileCreateNewLogin?partyId=${party.partyId}&CANCEL_PAGE=${DONE_PAGE!}</@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
</#if>
</ul>
<br class="clear" />

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=1825235&r1=1825234&r2=1825235&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyMenus.xml Sat Feb 24 12:44:24 2018
@@ -276,6 +276,7 @@
<menu-item name="update" title="${uiLabelMap.CommonUpdate}">
<link target="editperson">
<parameter param-name="partyId" from-field="parameters.partyId"/>
+ <parameter param-name="DONE_PAGE" from-field="DONE_PAGE"/>
</link>
</menu-item>
</menu>
@@ -320,6 +321,7 @@
<menu-item name="update" title="${uiLabelMap.CommonUpdate}">
<link target="editpartygroup">
<parameter param-name="partyId" from-field="party.partyId"/>
+ <parameter param-name="DONE_PAGE" from-field="DONE_PAGE"/>
</link>
</menu-item>
</menu>