You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2008/05/26 13:59:12 UTC
svn commit: r660171 - in /ofbiz/trunk/applications/humanres:
webapp/humanres/WEB-INF/controller.xml widget/CommonScreens.xml
widget/EmploymentScreens.xml widget/PartyAbilityScreens.xml
Author: ashish
Date: Mon May 26 04:59:11 2008
New Revision: 660171
URL: http://svn.apache.org/viewvc?rev=660171&view=rev
Log:
Small Cleanup.
Removed unused decorator.
Modified:
ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.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=660171&r1=660170&r2=660171&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Mon May 26 04:59:11 2008
@@ -615,7 +615,7 @@
</request-map>
<request-map uri="globalHRSetting">
<security https="true" auth="true"/>
- <response name="success" type="view" value="FindGlobalHRSettings"/>
+ <response name="success" type="view" value="EditSkillTypes"/>
</request-map>
<request-map uri="findTerminationTypes">
<security https="true" auth="true"/>
@@ -736,7 +736,6 @@
<view-map name="EmplPositionView" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EmplPositionView"/>
<view-map name="FindPersonTrainings" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#FindPersonTrainings"/>
<view-map name="NewPersonTraining" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#NewPersonTraining"/>
- <view-map name="FindGlobalHRSettings" type="screen" page="component://humanres/widget/EmploymentScreens.xml#ListGlobalHRSettings"/>
<view-map name="EditTerminationTypes" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditTerminationTypes"/>
<view-map name="EditPartySkills" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditPartySkills"/>
Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=660171&r1=660170&r2=660171&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Mon May 26 04:59:11 2008
@@ -151,7 +151,7 @@
</widgets>
</section>
</screen>
- <screen name="CommonPartyAbilityDecorator">
+ <screen name="CommonPerfReviewDecorator">
<section>
<actions>
<set field="perfReviewId" from-field="parameters.perfReviewId"/>
@@ -247,50 +247,6 @@
</widgets>
</section>
</screen>
- <screen name="CommonResponsibilityTypeDecorator">
- <section>
- <actions>
- <set field="headerItem" value="ResponsibilityType"/>
- <set field="responsibilityTypeId" from-field="parameters.responsibilityTypeId"/>
- <entity-one entity-name="ResponsibilityType" value-name="responsibilityType"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator">
- <decorator-section name="body">
- <section>
- <condition>
- <if-has-permission permission="HUMANRES" action="_VIEW"/>
- </condition>
- <widgets>
- <section>
- <condition>
- <not><if-empty field-name="responsibilityType"/></not>
- </condition>
- <widgets>
- <container style="h1">
- <label>${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor} [${responsibilityTypeId}]</label>
- </container>
- <container style="button-bar">
- <link target="EditResponsibilityType" text="${uiLabelMap.CommonNew} ${uiLabelMap.HumanResResponsibilityType}" style="buttontext"/>
- </container>
- </widgets>
- <fail-widgets>
- <container style="h1">
- <label>${uiLabelMap.CommonNew} ${uiLabelMap.HumanResResponsibilityType}</label>
- </container>
- </fail-widgets>
- </section>
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <label style="h3">${uiLabelMap.HumanResViewPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="GlobalHRSettingsDecorator">
<section>
<actions>
Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?rev=660171&r1=660170&r2=660171&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Mon May 26 04:59:11 2008
@@ -485,38 +485,6 @@
</widgets>
</section>
</screen>
- <screen name="ListGlobalHRSettings">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleListSkillTypes"/>
- <set field="headerItem" value="SkillType"/>
- <set field="labelTitleProperty" value="PageTitleListSkillTypes"/>
- </actions>
- <widgets>
- <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <screenlet title="${uiLabelMap.${labelTitleProperty}}">
- <section>
- <widgets>
- <container>
- <link target="EditSkillTypes" text="${uiLabelMap.HumanResNewSkillType}" style="buttontext" />
- </container>
- <include-form name="ListSkillTypes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.HumanResNewSkillType}">
- <section>
- <widgets>
- <include-form name="AddSkillType" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="EditPartySkills">
<section>
<actions>
Modified: ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml?rev=660171&r1=660170&r2=660171&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml Mon May 26 04:59:11 2008
@@ -27,7 +27,7 @@
<entity-one entity-name="PartyQual" value-name="partyQual"/>
</actions>
<widgets>
- <decorator-screen name="CommonPartyAbilityDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
@@ -59,7 +59,7 @@
<set field="partyResumeCtx" from-field="parameters"/>
</actions>
<widgets>
- <decorator-screen name="CommonPartyAbilityDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.HumanResFindPartyResume}">
<section>
@@ -93,7 +93,7 @@
<entity-one entity-name="PartyResume" value-name="partyResume" />
</actions>
<widgets>
- <decorator-screen name="CommonPartyAbilityDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
@@ -129,7 +129,7 @@
<entity-one entity-name="PerfReview" value-name="perfReview"/>
</actions>
<widgets>
- <decorator-screen name="CommonPartyAbilityDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
@@ -162,7 +162,7 @@
<set field="partySkillsCtx" from-field="parameters"/>
</actions>
<widgets>
- <decorator-screen name="CommonPartyAbilityDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.HumanResFindPartySkill}">
<section>
@@ -196,7 +196,7 @@
<entity-one entity-name="PartySkill" value-name="partySkill"/>
</actions>
<widgets>
- <decorator-screen name="CommonPartyAbilityDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.HumanResEditPartySkill}">
<section>
@@ -222,7 +222,7 @@
<set field="perfReviewId" from-field="parameters.perfReviewId"/>
</actions>
<widgets>
- <decorator-screen name="CommonPartyAbilityDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonPerfReviewDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResEditPerfReviewItems}">
<section>