svn commit: r1059340 - in /ofbiz/trunk/applications/humanres/widget: HumanresMenus.xml PerfReviewScreens.xml forms/PerfReviewForms.xml

[jacopoc]

Author: jacopoc
Date: Sat Jan 15 14:13:44 2011
New Revision: 1059340

URL: http://svn.apache.org/viewvc?rev=1059340&view=rev
Log:
Fixed a series of bugs (parameters not properly passed to screens and forms) that were affecting the "Performance Review" screens of humanres.

Modified:
    ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml
    ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml
    ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml

Modified: ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml?rev=1059340&r1=1059339&r2=1059340&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml Sat Jan 15 14:13:44 2011
@@ -122,8 +122,17 @@
     </menu>
     <menu name="PartyBar" default-menu-item-name="EditPerfReviewItems" default-selected-style="selected"
         type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
+        <menu-item name="EditPerfReview" title="${uiLabelMap.HumanResPerfReview}">
+            <link target="EditPerfReview">
+                <parameter param-name="employeePartyId"/>
+                <parameter param-name="employeeRoleTypeId"/>
+                <parameter param-name="perfReviewId"/>
+            </link>
+        </menu-item>
         <menu-item name="EditPerfReviewItems" title="${uiLabelMap.HumanResEditPerfReviewItems}">
             <link target="EditPerfReviewItems">
+                <parameter param-name="employeePartyId"/>
+                <parameter param-name="employeeRoleTypeId"/>
                 <parameter param-name="perfReviewId"/>
             </link>
         </menu-item>

Modified: ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml?rev=1059340&r1=1059339&r2=1059340&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml Sat Jan 15 14:13:44 2011
@@ -62,7 +62,7 @@
                 <entity-one entity-name="PerfReview" value-field="perfReview"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonPerfReviewDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.CommonEdit} ${uiLabelMap.HumanResPerfReview}">
                             <section>
@@ -83,6 +83,8 @@
                 <set field="titleProperty" value="PageTitleEditPartyReviewItem"/>
                 <set field="tabButtonItem" value="EditPerfReviewItems"/>
                 <set field="perfReviewId" from-field="parameters.perfReviewId"/>
+                <set field="employeePartyId" from-field="parameters.employeePartyId"/>
+                <set field="employeeRoleTypeId" from-field="parameters.employeeRoleTypeId"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPerfReviewDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml?rev=1059340&r1=1059339&r2=1059340&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml Sat Jan 15 14:13:44 2011
@@ -81,14 +81,6 @@ under the License.
             </entity-condition>
         </actions>
         <auto-fields-service default-field-type="display" service-name="updatePerfReviewItem"/>
-        <field name="perfReviewItemSeqId" widget-style="linktext">
-            <hyperlink also-hidden="false" description="${perfReviewItemSeqId}" target="EditPerfReviewItem">
-                <parameter param-name="perfReviewItemSeqId"/>
-                <parameter param-name="employeePartyId"/>
-                <parameter param-name="employeeRoleTypeId"/>
-                <parameter param-name="perfReviewId"/>
-            </hyperlink>
-        </field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
             <hyperlink target="deletePerfReviewItem" description="${uiLabelMap.CommonDelete}" also-hidden="false">
                 <parameter param-name="perfReviewId"/>