You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2017/04/15 11:17:47 UTC
svn commit: r1791492 - in /ofbiz/branches/release16.11: ./
applications/humanres/widget/EmploymentAppScreens.xml
applications/party/webapp/partymgr/WEB-INF/controller.xml
applications/party/widget/partymgr/PartyMenus.xml
Author: deepak
Date: Sat Apr 15 11:17:47 2017
New Revision: 1791492
URL: http://svn.apache.org/viewvc?rev=1791492&view=rev
Log:
Applied fix from trunk for revision: 1791490
===
Fixed: Applied slightly modified patch from jira, Employment Applications in Party manager does not list any record even if they exist (OFBIZ-9220)
Thanks Aditya Sharma for your contribution.
Modified:
ofbiz/branches/release16.11/ (props changed)
ofbiz/branches/release16.11/applications/humanres/widget/EmploymentAppScreens.xml
ofbiz/branches/release16.11/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyMenus.xml
Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 15 11:17:47 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,1790810,1791277,1791288,1791342,1791346
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790810,1791277,1791288,1791342,1791346,1791490
/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/humanres/widget/EmploymentAppScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/humanres/widget/EmploymentAppScreens.xml?rev=1791492&r1=1791491&r2=1791492&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/humanres/widget/EmploymentAppScreens.xml (original)
+++ ofbiz/branches/release16.11/applications/humanres/widget/EmploymentAppScreens.xml Sat Apr 15 11:17:47 2017
@@ -59,7 +59,7 @@
<set field="headerItem" value="Employee"/>
<set field="tabButtonItem" value="EditEmploymentApps"/>
<set field="referredByPartyId" from-field="parameters.partyId"/>
- <set field="employmentAppCtx.applicationId" from-field="parameters.applicationId"/>
+ <set field="employmentAppCtx.referredByPartyId" from-field="referredByPartyId"/>
<set field="parameters.insideEmployee" value="true"/>
</actions>
<widgets>
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=1791492&r1=1791491&r2=1791492&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 Apr 15 11:17:47 2017
@@ -1041,7 +1041,9 @@ under the License.
<request-map uri="createEmploymentAppExt">
<security https="true" auth="true"/>
<event type="service" invoke="createEmploymentApp"/>
- <response name="success" type="request" value="EditEmploymentApps"/>
+ <response name="success" type="request-redirect" value="EditEmploymentApps">
+ <redirect-parameter name="partyId"/>
+ </response>
</request-map>
<request-map uri="updateEmploymentAppExt">
<security https="true" auth="true"/>
@@ -1051,7 +1053,9 @@ under the License.
<request-map uri="deleteEmploymentApp">
<security https="true" auth="true"/>
<event type="service" invoke="deleteEmploymentApp"/>
- <response name="success" type="request" value="EditEmploymentApps"/>
+ <response name="success" type="request-redirect" value="EditEmploymentApps">
+ <redirect-parameter name="partyId"/>
+ </response>
</request-map>
<!-- Ajax Requests -->
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=1791492&r1=1791491&r2=1791492&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/branches/release16.11/applications/party/widget/partymgr/PartyMenus.xml Sat Apr 15 11:17:47 2017
@@ -123,7 +123,6 @@
<menu-item name="EditEmploymentApps" title="${uiLabelMap.HumanResEmploymentApp}">
<link target="EditEmploymentApps">
<parameter param-name="partyId"/>
- <parameter param-name="referredByPartyId" from-field="partyId"/>
</link>
</menu-item>
<menu-item name="FinancialHistory" title="${uiLabelMap.PartyFinancialHistory}">