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:15:43 UTC
svn commit: r1791490 - in /ofbiz/ofbiz-framework/trunk/applications:
humanres/widget/EmploymentAppScreens.xml
party/webapp/partymgr/WEB-INF/controller.xml
party/widget/partymgr/PartyMenus.xml
Author: deepak
Date: Sat Apr 15 11:15:43 2017
New Revision: 1791490
URL: http://svn.apache.org/viewvc?rev=1791490&view=rev
Log:
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/ofbiz-framework/trunk/applications/humanres/widget/EmploymentAppScreens.xml
ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml
Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/widget/EmploymentAppScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/widget/EmploymentAppScreens.xml?rev=1791490&r1=1791489&r2=1791490&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/humanres/widget/EmploymentAppScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/humanres/widget/EmploymentAppScreens.xml Sat Apr 15 11:15:43 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/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1791490&r1=1791489&r2=1791490&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sat Apr 15 11:15:43 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/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=1791490&r1=1791489&r2=1791490&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml Sat Apr 15 11:15:43 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}">