Re: svn commit: r826266 - in /ofbiz/trunk/applications: humanres/data/ humanres/webapp/humanres/WEB-INF/ humanres/widget/ party/webapp/partymgr/WEB-INF/ party/widget/partymgr/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r826266 - in /ofbiz/trunk/applications: humanres/data/ humanres/webapp/humanres/WEB-INF/ humanres/widget/ party/webapp/partymgr/WEB-INF/ party/widget/partymgr/

hans_bakker
Hi Jacques,

this commits add the line:
<property-map resource="WebPosUiLabels" map-name="uiLabelMap"
global="true"/>

to the party commonscreens file.

If the webpos component is not loaded the party profile screen will not
display anymore.

can you please correct this?
I do not know what the implication of this line is?

Regards,
Hans



On Sat, 2009-10-17 at 15:05 +0000, [hidden email] wrote:

> Author: jleroux
> Date: Sat Oct 17 15:05:32 2009
> New Revision: 826266
>
> URL: http://svn.apache.org/viewvc?rev=826266&view=rev
> Log:
> merged by hand from Simranjeet Singh's HR_Training_improvements.patch in " Enhancements in Trainings under HR module" (https://issues.apache.org/jira/browse/OFBIZ-2531) - OFBIZ-2531
> Please see this issue for more, it's enough complicated as is...
> In one word this patch was waiting comments for near a month and https://issues.apache.org/jira/browse/OFBIZ-3046 decided me to act!
>
> Modified:
>     ofbiz/trunk/applications/humanres/data/HumanResDemoData.xml
>     ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
>     ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
>     ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml
>     ofbiz/trunk/applications/humanres/widget/Menus.xml
>     ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml
>     ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
>     ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
>
> Modified: ofbiz/trunk/applications/humanres/data/HumanResDemoData.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResDemoData.xml?rev=826266&r1=826265&r2=826266&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/humanres/data/HumanResDemoData.xml (original)
> +++ ofbiz/trunk/applications/humanres/data/HumanResDemoData.xml Sat Oct 17 15:05:32 2009
> @@ -34,6 +34,10 @@
>      <UserLoginSecurityGroup groupId="HUMANRES_APPROVER" userLoginId="demoapprover" fromDate="2001-01-01 12:00:00.0"/>
>  
>      <UserLogin userLoginId="demoemployee" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" requirePasswordChange="N" partyId="DemoEmployee"/>
> +    <SecurityPermission description="Employee can check the status of his requests and trainings assigned to him with this permission." permissionId="EMPLOYEE_VIEW"/>
> +    <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="EMPLOYEE_VIEW"/>
> +    <UserLoginSecurityGroup groupId="HUMANRES_EMPLOYEE" userLoginId="DemoEmployee" fromDate="2001-01-01 12:00:00.0"/>
> +
>      <UserLoginSecurityGroup groupId="HUMANRES_EMPLOYEE" userLoginId="demoemployee" fromDate="2001-01-01 12:00:00.0"/>
>  
>  </entity-engine-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=826266&r1=826265&r2=826266&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
> +++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Sat Oct 17 15:05:32 2009
> @@ -620,6 +620,10 @@
>          <response name="success" type="view" value="EditEmployeeQuals"/>
>          <response name="error" type="view" value="EditEmployeeQuals"/>
>      </request-map>
> +    <request-map uri="EditEmployeeTrainings">
> +        <security https="true" auth="true"/>
> +        <response name="success" type="view" value="EditEmployeeTrainings"/>
> +    </request-map>
>      <request-map uri="EditEmployeeResumes">
>          <security https="true" auth="true"/>
>          <response name="success" type="view" value="EditEmployeeResumes"/>
> @@ -1075,6 +1079,7 @@
>      <view-map name="NewEmployee" type="screen" page="component://humanres/widget/EmployeeScreens.xml#NewEmployee"/>
>      <view-map name="EmployeeProfile" type="screen" page="component://humanres/widget/EmployeeScreens.xml#EmployeeProfile"/>
>      <view-map name="EditEmployeeSkills" type="screen" page="component://humanres/widget/EmployeeScreens.xml#EditEmployeeSkills"/>
> +    <view-map name="EditEmployeeTrainings" type="screen" page="component://humanres/widget/EmployeeScreens.xml#EditEmployeeTrainings"/>
>      <view-map name="EditEmployeeQuals" type="screen" page="component://humanres/widget/EmployeeScreens.xml#EditEmployeeQuals"/>
>      <view-map name="EditEmployeeEmploymentApps" type="screen" page="component://humanres/widget/EmployeeScreens.xml#EditEmployeeEmploymentApps"/>
>      <view-map name="EditEmployeeResumes" type="screen" page="component://humanres/widget/EmployeeScreens.xml#EditEmployeeResumes"/>
>
> Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=826266&r1=826265&r2=826266&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original)
> +++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Sat Oct 17 15:05:32 2009
> @@ -233,6 +233,7 @@
>                  <set field="partyId" from-field="parameters.partyId"/>
>                  <entity-one entity-name="Party" value-field="party"/>
>                  <entity-one entity-name="Person" value-field="lookupPerson"/>
> +                <property-map resource="WebPosUiLabels" map-name="uiLabelMap" global="true"/>
>              </actions>
>              <widgets>
>                  <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
>
> Modified: ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml?rev=826266&r1=826265&r2=826266&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml (original)
> +++ ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml Sat Oct 17 15:05:32 2009
> @@ -191,6 +191,22 @@
>              </widgets>
>          </section>
>      </screen>
> +    <screen name="EditEmployeeTrainings">
> +        <section>
> +            <actions>
> +                <set field="tabButtonItem" value="EditEmployeeTrainings"/>
> +            </actions>
> +            <widgets>
> +                <decorator-screen name="EmployeeDecorator" location="${parameters.mainDecoratorLocation}">
> +                    <decorator-section name="body">
> +                        <screenlet id="TrainingStatus" title="${uiLabelMap.HumanResTrainingStatus}" collapsible="true">
> +                            <include-form name="ListTrainingStatus" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>>
> +                        </screenlet>
> +                    </decorator-section>
> +                </decorator-screen>
> +            </widgets>
> +        </section>
> +    </screen>
>      <screen name="EditEmployeeEmploymentApps">
>          <section>
>              <actions>
>
> Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=826266&r1=826265&r2=826266&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/humanres/widget/Menus.xml (original)
> +++ ofbiz/trunk/applications/humanres/widget/Menus.xml Sat Oct 17 15:05:32 2009
> @@ -201,8 +201,8 @@
>                  <parameter param-name="partyId"/>
>              </link>
>          </menu-item>
> -        <menu-item name="EditTrainingCalendar" title="${uiLabelMap.HumanResTraining}">
> -            <link target="TrainingCalendar">
> +        <menu-item name="EditEmployeeTrainings" title="${uiLabelMap.HumanResTraining}">
> +            <link target="EditEmployeeTrainings">
>                  <parameter param-name="partyId"/>
>              </link>
>          </menu-item>
> @@ -280,7 +280,7 @@
>              <link target="TrainingCalendar"/>
>          </menu-item>
>          <menu-item name="FindTrainingStatus" title="${uiLabelMap.HumanResTrainingStatus}">
> -            <condition><not><if-has-permission permission="HUMANRES" action="_ADMIN"/></not></condition><!-- TODO: is not possible need to create a permission for this.-->
> +            <condition><if-has-permission permission="EMPLOYEE" action="_VIEW"/></condition>
>              <link target="FindTrainingStatus"/>
>          </menu-item>
>          <menu-item name="FindTrainingApprovals" title="${uiLabelMap.HumanResTrainingApprovals}">
>
> Modified: ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml?rev=826266&r1=826265&r2=826266&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml (original)
> +++ ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml Sat Oct 17 15:05:32 2009
> @@ -264,4 +264,20 @@
>                   </widgets>
>           </section>
>       </screen>
> +     <screen name="ListTrainingStatus">
> +         <section>
> +             <actions>
> +                 <set field="tabButtonItem" value="EditPersonTrainings"/>
> +             </actions>
> +                 <widgets>
> +                     <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
> +                         <decorator-section name="body">
> +                             <screenlet id="TrainingStatus" title="${uiLabelMap.HumanResTrainingStatus}" collapsible="true">
> +                                 <include-form name="ListTrainingStatus" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
> +                             </screenlet>
> +                         </decorator-section>
> +                     </decorator-screen>
> +                 </widgets>
> +         </section>
> +     </screen>
>  </screens>
> \ No newline at end of file
>
> 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=826266&r1=826265&r2=826266&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
> +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sat Oct 17 15:05:32 2009
> @@ -1375,7 +1375,7 @@
>      <view-map name="PartyInvitationGroupAssocs" type="screen" page="component://party/widget/partymgr/PartyInvitationScreens.xml#EditPartyInvitationsGroupAssocs"/>
>      <view-map name="PartyInvitationRoleAssocs" type="screen" page="component://party/widget/partymgr/PartyInvitationScreens.xml#EditPartyInvitationsRoleAssocs"/>
>      <view-map name="EditPartySkills" type="screen" page="component://humanres/widget/PartySkillScreens.xml#EditPartySkills"/>
> -    <view-map name="EditPersonTrainings" type="screen" page="component://humanres/widget/PersonTrainingScreens.xml#EditPersonTrainings"/>
> +    <view-map name="EditPersonTrainings" type="screen" page="component://humanres/widget/PersonTrainingScreens.xml#ListTrainingStatus"/>
>      <view-map name="EditPartyResumes" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPartyResumes"/>
>      <view-map name="EditEmploymentApps" type="screen" page="component://humanres/widget/EmploymentAppScreens.xml#EditEmploymentApps"/>
>      <view-map name="PartyFinancialHistory" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#PartyFinancialHistory"/>
>
> Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=826266&r1=826265&r2=826266&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
> +++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Sat Oct 17 15:05:32 2009
> @@ -65,6 +65,7 @@
>                  <entity-one entity-name="Party" value-field="party"/>
>                  <entity-one entity-name="Person" value-field="lookupPerson"/>
>                  <entity-one entity-name="PartyGroup" value-field="lookupGroup"/>
> +                <property-map resource="WebPosUiLabels" map-name="uiLabelMap" global="true"/>
>              </actions>
>              <widgets>
>                  <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
>
>
--
Antwebsystems.com: Quality OFBiz services for competitive rates

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r826266 - in /ofbiz/trunk/applications: humanres/data/ humanres/webapp/humanres/WEB-INF/ humanres/widget/ party/webapp/partymgr/WEB-INF/ party/widget/partymgr/

Jacques Le Roux
Administrator
Hi Hans,

I did not spot this one. It does not make any sense to me. I wonder why this line has slipped in, I guess another collateral effect
of C/P
Removed at r831190

Thanks

Jacques

From: "Hans Bakker" <[hidden email]>

> Hi Jacques,
>
> this commits add the line:
> <property-map resource="WebPosUiLabels" map-name="uiLabelMap"
> global="true"/>
>
> to the party commonscreens file.
>
> If the webpos component is not loaded the party profile screen will not
> display anymore.
>
> can you please correct this?
> I do not know what the implication of this line is?
>
> Regards,
> Hans
>
>
>
> On Sat, 2009-10-17 at 15:05 +0000, [hidden email] wrote:
>> Author: jleroux
>> Date: Sat Oct 17 15:05:32 2009
>> New Revision: 826266
>>
>> URL: http://svn.apache.org/viewvc?rev=826266&view=rev
>> Log:
>> merged by hand from Simranjeet Singh's HR_Training_improvements.patch in " Enhancements in Trainings under HR module"
>> (https://issues.apache.org/jira/browse/OFBIZ-2531) - OFBIZ-2531
>> Please see this issue for more, it's enough complicated as is...
>> In one word this patch was waiting comments for near a month and https://issues.apache.org/jira/browse/OFBIZ-3046 decided me to
>> act!
>>
>> Modified:
>>     ofbiz/trunk/applications/humanres/data/HumanResDemoData.xml
>>     ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
>>     ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
>>     ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml
>>     ofbiz/trunk/applications/humanres/widget/Menus.xml
>>     ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml
>>     ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
>>     ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
>>
>> Modified: ofbiz/trunk/applications/humanres/data/HumanResDemoData.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResDemoData.xml?rev=826266&r1=826265&r2=826266&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/humanres/data/HumanResDemoData.xml (original)
>> +++ ofbiz/trunk/applications/humanres/data/HumanResDemoData.xml Sat Oct 17 15:05:32 2009
>> @@ -34,6 +34,10 @@
>>      <UserLoginSecurityGroup groupId="HUMANRES_APPROVER" userLoginId="demoapprover" fromDate="2001-01-01 12:00:00.0"/>
>>
>>      <UserLogin userLoginId="demoemployee" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a"
>> requirePasswordChange="N" partyId="DemoEmployee"/>
>> +    <SecurityPermission description="Employee can check the status of his requests and trainings assigned to him with this
>> permission." permissionId="EMPLOYEE_VIEW"/>
>> +    <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="EMPLOYEE_VIEW"/>
>> +    <UserLoginSecurityGroup groupId="HUMANRES_EMPLOYEE" userLoginId="DemoEmployee" fromDate="2001-01-01 12:00:00.0"/>
>> +
>>      <UserLoginSecurityGroup groupId="HUMANRES_EMPLOYEE" userLoginId="demoemployee" fromDate="2001-01-01 12:00:00.0"/>
>>
>>  </entity-engine-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=826266&r1=826265&r2=826266&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
>> +++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Sat Oct 17 15:05:32 2009
>> @@ -620,6 +620,10 @@
>>          <response name="success" type="view" value="EditEmployeeQuals"/>
>>          <response name="error" type="view" value="EditEmployeeQuals"/>
>>      </request-map>
>> +    <request-map uri="EditEmployeeTrainings">
>> +        <security https="true" auth="true"/>
>> +        <response name="success" type="view" value="EditEmployeeTrainings"/>
>> +    </request-map>
>>      <request-map uri="EditEmployeeResumes">
>>          <security https="true" auth="true"/>
>>          <response name="success" type="view" value="EditEmployeeResumes"/>
>> @@ -1075,6 +1079,7 @@
>>      <view-map name="NewEmployee" type="screen" page="component://humanres/widget/EmployeeScreens.xml#NewEmployee"/>
>>      <view-map name="EmployeeProfile" type="screen" page="component://humanres/widget/EmployeeScreens.xml#EmployeeProfile"/>
>>      <view-map name="EditEmployeeSkills" type="screen"
>> page="component://humanres/widget/EmployeeScreens.xml#EditEmployeeSkills"/>
>> +    <view-map name="EditEmployeeTrainings" type="screen"
>> page="component://humanres/widget/EmployeeScreens.xml#EditEmployeeTrainings"/>
>>      <view-map name="EditEmployeeQuals" type="screen" page="component://humanres/widget/EmployeeScreens.xml#EditEmployeeQuals"/>
>>      <view-map name="EditEmployeeEmploymentApps" type="screen"
>> page="component://humanres/widget/EmployeeScreens.xml#EditEmployeeEmploymentApps"/>
>>      <view-map name="EditEmployeeResumes" type="screen"
>> page="component://humanres/widget/EmployeeScreens.xml#EditEmployeeResumes"/>
>>
>> Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=826266&r1=826265&r2=826266&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original)
>> +++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Sat Oct 17 15:05:32 2009
>> @@ -233,6 +233,7 @@
>>                  <set field="partyId" from-field="parameters.partyId"/>
>>                  <entity-one entity-name="Party" value-field="party"/>
>>                  <entity-one entity-name="Person" value-field="lookupPerson"/>
>> +                <property-map resource="WebPosUiLabels" map-name="uiLabelMap" global="true"/>
>>              </actions>
>>              <widgets>
>>                  <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
>>
>> Modified: ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml?rev=826266&r1=826265&r2=826266&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml (original)
>> +++ ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml Sat Oct 17 15:05:32 2009
>> @@ -191,6 +191,22 @@
>>              </widgets>
>>          </section>
>>      </screen>
>> +    <screen name="EditEmployeeTrainings">
>> +        <section>
>> +            <actions>
>> +                <set field="tabButtonItem" value="EditEmployeeTrainings"/>
>> +            </actions>
>> +            <widgets>
>> +                <decorator-screen name="EmployeeDecorator" location="${parameters.mainDecoratorLocation}">
>> +                    <decorator-section name="body">
>> +                        <screenlet id="TrainingStatus" title="${uiLabelMap.HumanResTrainingStatus}" collapsible="true">
>> +                            <include-form name="ListTrainingStatus"
>> location="component://humanres/widget/forms/PersonTrainingForms.xml"/>>
>> +                        </screenlet>
>> +                    </decorator-section>
>> +                </decorator-screen>
>> +            </widgets>
>> +        </section>
>> +    </screen>
>>      <screen name="EditEmployeeEmploymentApps">
>>          <section>
>>              <actions>
>>
>> Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=826266&r1=826265&r2=826266&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/humanres/widget/Menus.xml (original)
>> +++ ofbiz/trunk/applications/humanres/widget/Menus.xml Sat Oct 17 15:05:32 2009
>> @@ -201,8 +201,8 @@
>>                  <parameter param-name="partyId"/>
>>              </link>
>>          </menu-item>
>> -        <menu-item name="EditTrainingCalendar" title="${uiLabelMap.HumanResTraining}">
>> -            <link target="TrainingCalendar">
>> +        <menu-item name="EditEmployeeTrainings" title="${uiLabelMap.HumanResTraining}">
>> +            <link target="EditEmployeeTrainings">
>>                  <parameter param-name="partyId"/>
>>              </link>
>>          </menu-item>
>> @@ -280,7 +280,7 @@
>>              <link target="TrainingCalendar"/>
>>          </menu-item>
>>          <menu-item name="FindTrainingStatus" title="${uiLabelMap.HumanResTrainingStatus}">
>> -            <condition><not><if-has-permission permission="HUMANRES" action="_ADMIN"/></not></condition><!-- TODO: is not
>> possible need to create a permission for this.-->
>> +            <condition><if-has-permission permission="EMPLOYEE" action="_VIEW"/></condition>
>>              <link target="FindTrainingStatus"/>
>>          </menu-item>
>>          <menu-item name="FindTrainingApprovals" title="${uiLabelMap.HumanResTrainingApprovals}">
>>
>> Modified: ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml?rev=826266&r1=826265&r2=826266&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml (original)
>> +++ ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml Sat Oct 17 15:05:32 2009
>> @@ -264,4 +264,20 @@
>>                   </widgets>
>>           </section>
>>       </screen>
>> +     <screen name="ListTrainingStatus">
>> +         <section>
>> +             <actions>
>> +                 <set field="tabButtonItem" value="EditPersonTrainings"/>
>> +             </actions>
>> +                 <widgets>
>> +                     <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
>> +                         <decorator-section name="body">
>> +                             <screenlet id="TrainingStatus" title="${uiLabelMap.HumanResTrainingStatus}" collapsible="true">
>> +                                 <include-form name="ListTrainingStatus"
>> location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
>> +                             </screenlet>
>> +                         </decorator-section>
>> +                     </decorator-screen>
>> +                 </widgets>
>> +         </section>
>> +     </screen>
>>  </screens>
>> \ No newline at end of file
>>
>> 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=826266&r1=826265&r2=826266&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
>> +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sat Oct 17 15:05:32 2009
>> @@ -1375,7 +1375,7 @@
>>      <view-map name="PartyInvitationGroupAssocs" type="screen"
>> page="component://party/widget/partymgr/PartyInvitationScreens.xml#EditPartyInvitationsGroupAssocs"/>
>>      <view-map name="PartyInvitationRoleAssocs" type="screen"
>> page="component://party/widget/partymgr/PartyInvitationScreens.xml#EditPartyInvitationsRoleAssocs"/>
>>      <view-map name="EditPartySkills" type="screen" page="component://humanres/widget/PartySkillScreens.xml#EditPartySkills"/>
>> -    <view-map name="EditPersonTrainings" type="screen"
>> page="component://humanres/widget/PersonTrainingScreens.xml#EditPersonTrainings"/>
>> +    <view-map name="EditPersonTrainings" type="screen"
>> page="component://humanres/widget/PersonTrainingScreens.xml#ListTrainingStatus"/>
>>      <view-map name="EditPartyResumes" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPartyResumes"/>
>>      <view-map name="EditEmploymentApps" type="screen"
>> page="component://humanres/widget/EmploymentAppScreens.xml#EditEmploymentApps"/>
>>      <view-map name="PartyFinancialHistory" type="screen"
>> page="component://party/widget/partymgr/PartyScreens.xml#PartyFinancialHistory"/>
>>
>> Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=826266&r1=826265&r2=826266&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
>> +++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Sat Oct 17 15:05:32 2009
>> @@ -65,6 +65,7 @@
>>                  <entity-one entity-name="Party" value-field="party"/>
>>                  <entity-one entity-name="Person" value-field="lookupPerson"/>
>>                  <entity-one entity-name="PartyGroup" value-field="lookupGroup"/>
>> +                <property-map resource="WebPosUiLabels" map-name="uiLabelMap" global="true"/>
>>              </actions>
>>              <widgets>
>>                  <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
>>
>>
> --
> Antwebsystems.com: Quality OFBiz services for competitive rates
>