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 2014/01/25 13:09:47 UTC
svn commit: r1561289 - in /ofbiz/branches/release11.04: ./
applications/humanres/widget/forms/EmplPositionForms.xml
Author: jleroux
Date: Sat Jan 25 12:09:47 2014
New Revision: 1561289
URL: http://svn.apache.org/r1561289
Log:
"Applied fix from trunk for revision: 1561286"
------------------------------------------------------------------------
r1561286 | jleroux | 2014-01-25 12:58:09 +0100 (sam. 25 janv. 2014) | 6 lignes
A (slightly enhanced) patch from Christian Carlow for "EditEmplPosition form widget missing Internal Org drop down and title incorrect" https://issues.apache.org/jira/browse/OFBIZ-5509
EditEmplPosition shows a partyId field as a text box instead of a <select> drop down that lists the internal orgs. The field title should also be set to Internal Org instead of PartyId for consistency.
jleroux: while at it I added a tooltip
------------------------------------------------------------------------
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/applications/humanres/widget/forms/EmplPositionForms.xml
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1561286
Modified: ofbiz/branches/release11.04/applications/humanres/widget/forms/EmplPositionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/humanres/widget/forms/EmplPositionForms.xml?rev=1561289&r1=1561288&r2=1561289&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/humanres/widget/forms/EmplPositionForms.xml (original)
+++ ofbiz/branches/release11.04/applications/humanres/widget/forms/EmplPositionForms.xml Sat Jan 25 12:09:47 2014
@@ -63,9 +63,9 @@ under the License.
<field use-when="emplPosition!=null" name="emplPositionId" title="${uiLabelMap.HumanResEmplPositionId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field use-when="emplPosition==null&&emplPositionId==null" name="emplPositionId" title="${uiLabelMap.HumanResEmplPositionId}"><lookup target-form-name="LookupEmplPosition"/></field>
<field use-when="emplPosition==null&&emplPositionId!=null" name="emplPositionId" title="${uiLabelMap.HumanResEmplPositionId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${emplPositionId}]"><display/></field>
- <field name="partyId" parameter-name="partyId">
+ <field name="partyId" parameter-name="partyId" title="${uiLabelMap.HumanResEmploymentPartyIdFrom}" tooltip="${uiLabelMap.HumanResEmploymentPartyIdFromToolTip}">
<drop-down allow-empty="false">
- <entity-options description="${partyId}" entity-name="PartyRole" key-field-name="partyId">
+ <entity-options description="${groupName}" entity-name="PartyRoleAndPartyDetail" key-field-name="partyId">
<entity-constraint name="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
<entity-order-by field-name="partyId"/>
</entity-options>