svn commit: r701763 - in /ofbiz/trunk/applications/humanres: webapp/humanres/WEB-INF/controller.xml widget/forms/EmplPositionForms.xml

[mrisaliti]

Author: mrisaliti
Date: Sun Oct  5 02:19:33 2008
New Revision: 701763

URL: http://svn.apache.org/viewvc?rev=701763&view=rev
Log:
Some cleanup on humanres component (Part of issue OFBIZ-1982)

Modified:
    ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
    ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml

Modified: ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=701763&r1=701762&r2=701763&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Sun Oct  5 02:19:33 2008
@@ -189,10 +189,6 @@
         <response name="success" type="view" value="EditPerformanceNotes"/>
         <response name="error" type="view" value="EditPerformanceNotes"/>
     </request-map>
-    <request-map uri="findPersonTrainings">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="ListPersonTrainings"/>
-    </request-map>
     <!-- ================Employment Group==================================== -->      
     <request-map uri="FindEmployments">
         <security https="true" auth="true"/>
@@ -215,7 +211,7 @@
     <request-map uri="deleteEmployment">
         <security https="true" auth="true"/>
         <event type="service" invoke="deleteEmployment"/>
-        <response name="success" type="view" value="ListEmployments"/>
+        <response name="success" type="view" value="FindEmployments"/>
     </request-map>
     <request-map uri="FindEmploymentApps">
         <security https="true" auth="true"/>
@@ -257,7 +253,7 @@
     </request-map>
     <request-map uri="findPartyBenefits">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="ListPartyBenefits"/>
+        <response name="success" type="view" value="EditPartyBenefits"/>
     </request-map>
     <request-map uri="EditPartyBenefits">
         <security https="true" auth="true"/>        
@@ -530,12 +526,12 @@
     <request-map uri="createValidResponsibility">
         <security https="true" auth="true"/>
         <event type="service" invoke="createValidResponsibility"/>
-        <response name="success" type="view" value="EditEmplPositionResponsibility"/>
+        <response name="success" type="view" value="EditValidResponsibility"/>
     </request-map>
     <request-map uri="updateValidResponsibility">
         <security https="true" auth="true"/>
         <event type="service" invoke="updateValidResponsibility"/>
-        <response name="success" type="view" value="EditEmplPositionResponsibility"/>
+        <response name="success" type="view" value="EditValidResponsibility"/>
     </request-map>
     <request-map uri="deleteValidResponsibility">
         <security https="true" auth="true"/>
@@ -851,7 +847,6 @@
     
     <view-map name="FindEmployments" type="screen" page="component://humanres/widget/EmploymentScreens.xml#FindEmployments"/>
     <view-map name="EditEmployment" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditEmployment"/>
-    <view-map name="ListPartyBenefits" type="screen" page="component://humanres/widget/EmploymentScreens.xml#ListPartyBenefits"/>
     <view-map name="EditPartyBenefits" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditPartyBenefits"/>
     <view-map name="EditPayrollPreferences" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditPayrollPreferences"/>
     <view-map name="ListPayHistories" type="screen" page="component://humanres/widget/EmploymentScreens.xml#ListPayHistories"/>    

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=701763&r1=701762&r2=701763&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Sun Oct  5 02:19:33 2008
@@ -216,14 +216,14 @@
         <auto-fields-service service-name="createValidResponsibility"/>        
         <field name="emplPositionTypeId">
             <drop-down allow-empty="false">                
-                <entity-options entity-name="emplPositionType" key-field-name="emplPositionTypeId" description=" ${description}">
+                <entity-options entity-name="EmplPositionType" key-field-name="emplPositionTypeId" description=" ${description}">
                     <entity-order-by field-name="description"/>
                 </entity-options>                
             </drop-down>
         </field>
         <field name="responsibilityTypeId">
             <drop-down allow-empty="false">                
-                <entity-options entity-name="responsibilityType" key-field-name="responsibilityTypeId" description=" ${description}">
+                <entity-options entity-name="ResponsibilityType" key-field-name="responsibilityTypeId" description=" ${description}">
                     <entity-order-by field-name="description"/>
                 </entity-options>                
             </drop-down>