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 2009/09/22 00:20:11 UTC
svn commit: r817443 - in /ofbiz/trunk/applications:
humanres/widget/EmployeeScreens.xml humanres/widget/forms/EmployeeForms.xml
party/webapp/partymgr/WEB-INF/controller.xml
Author: jleroux
Date: Mon Sep 21 22:20:10 2009
New Revision: 817443
URL: http://svn.apache.org/viewvc?rev=817443&view=rev
Log:
Fix issues with r802308 : all calls to createPersonTraining and updatePersonTraining services from forms, screens and controllers should have been removed
Modified:
ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml
ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
Modified: ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml?rev=817443&r1=817442&r2=817443&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml Mon Sep 21 22:20:10 2009
@@ -191,28 +191,6 @@
</widgets>
</section>
</screen>
- <screen name="EditEmployeeTrainings">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleViewPersonTraining"/>
- <set field="tabButtonItem" value="EditEmployeeTrainings"/>
- <set field="partyId" from-field="parameters.partyId"/>
- <set field="trainingClassTypeId" from-field="parameters.trainingClassTypeId"/>
- <set field="personTrainingsCtx.partyId" from-field="parameters.partyId"/>
- <set field="parameters.insideEmployee" value="true"/>
- </actions>
- <widgets>
- <decorator-screen name="EmployeeDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <include-form name="ListEmployeeTrainings" location="component://humanres/widget/forms/EmployeeForms.xml"/>
- <screenlet id="AddPersonTrainingPanel" title="${uiLabelMap.HumanResAddPersonTraining}" collapsible="true">
- <include-form name="AddEmployeeTraining" location="component://humanres/widget/forms/EmployeeForms.xml"/>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="EditEmployeeEmploymentApps">
<section>
<actions>
@@ -307,4 +285,4 @@
</widgets>
</section>
</screen>
-</screens>
\ No newline at end of file
+</screens>
Modified: ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml?rev=817443&r1=817442&r2=817443&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml Mon Sep 21 22:20:10 2009
@@ -18,7 +18,7 @@
under the License.
-->
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="AddEmployee" type="single" target="createEmployee"
header-row-style="header-row" default-table-style="basic-table">
@@ -184,27 +184,6 @@
<field name="thruDate"><date-time type="timestamp"/></field>
<field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListEmployeeTrainings" type="list" list-name="listIt" separate-columns="true" target="updateEmployeeTraining" paginate-target="FindPersonTrainings"
- odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
- <actions>
- <entity-condition entity-name="PersonTraining">
- <condition-expr field-name="partyId" from-field="partyId"/>
- <order-by field-name="fromDate"/>
- </entity-condition>
- </actions>
- <auto-fields-service default-field-type="display" service-name="updatePersonTraining"/>
- <field name="partyId"><hidden/></field>
- <field name="trainingClassTypeId"><display-entity description="${description}" entity-name="TrainingClassType"/></field>
- <field name="thruDate"><date-time type="timestamp"/></field>
- <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
- <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
- <hyperlink target="deleteEmployeeTraining" also-hidden="false" description="${uiLabelMap.CommonDelete}">
- <parameter param-name="partyId"/>
- <parameter param-name="trainingClassTypeId"/>
- <parameter param-name="fromDate"/>
- </hyperlink>
- </field>
- </form>
<form name="AddEmplLeave" type="single" target="createEmplLeave">
<auto-fields-service service-name="createEmplLeave"/>
<field name="partyId"><hidden/></field>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=817443&r1=817442&r2=817443&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Mon Sep 21 22:20:10 2009
@@ -54,7 +54,7 @@
</request-map>
<request-map uri="EditPartyRelationships"><security https="true" auth="true"/><response name="success" type="view" value="EditPartyRelationships"/></request-map>
<request-map uri="viewroles"><security https="true" auth="true"/><response name="success" type="view" value="viewroles"/></request-map>
- <request-map uri="viewidentifications"><security https="true" auth="true"/><response name="success" type="view" value="viewidentifications"/></request-map>
+ <request-map uri="viewidentifications"><security https="true" auth="true"/><response name="success" type="view" value="viewidentifications"/></request-map>
<request-map uri="linkparty"><security https="true" auth="true"/><response name="success" type="view" value="linkparty"/></request-map>
<request-map uri="partyInvitation"><security https="true" auth="true"/><response name="success" type="view" value="partyInvitation"/></request-map>
<request-map uri="editPartyInvitation"><security https="true" auth="true"/><response name="success" type="view" value="editPartyInvitation"/></request-map>
@@ -1111,18 +1111,6 @@
<response name="success" type="view" value="EditPersonTrainings"/>
<response name="error" type="view" value="EditPersonTrainings"/>
</request-map>
- <request-map uri="createPersonTrainingExt">
- <security https="true" auth="true"/>
- <event type="service" invoke="createPersonTraining"/>
- <response name="success" type="view" value="EditPersonTrainings"/>
- <response name="error" type="view" value="EditPersonTrainings"/>
- </request-map>
- <request-map uri="updatePersonTrainingsExt">
- <security https="true" auth="true"/>
- <event type="service-multi" invoke="updatePersonTraining"/>
- <response name="success" type="view" value="EditPersonTrainings"/>
- <response name="error" type="view" value="EditPersonTrainings"/>
- </request-map>
<request-map uri="EditPartyResumes">
<security https="true" auth="true"/>
<response name="success" type="view" value="EditPartyResumes"/>