svn commit: r1561307 - in /ofbiz/branches/release12.04: ./ applications/humanres/widget/LookupScreens.xml applications/humanres/widget/forms/LookupForms.xml

Author: jleroux
Date: Sat Jan 25 13:36:46 2014
New Revision: 1561307

URL: http://svn.apache.org/r1561307
Log:
"Applied fix from trunk for revision: 1561305  "
------------------------------------------------------------------------
r1561305 | jleroux | 2014-01-25 14:35:32 +0100 (sam. 25 janv. 2014) | 4 lignes

A Christian Carlow's patch for "EditEmplPositionReportingStructs LookupEmplPosition associated popup and dropdown empty" https://issues.apache.org/jira/browse/OFBIZ-5510

LookupEmplPosition drop-down and popup window show no results on the EditEmplPositionReportingStructs page for the field.

------------------------------------------------------------------------


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/applications/humanres/widget/LookupScreens.xml
    ofbiz/branches/release12.04/applications/humanres/widget/forms/LookupForms.xml

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1561305

Modified: ofbiz/branches/release12.04/applications/humanres/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/humanres/widget/LookupScreens.xml?rev=1561307&r1=1561306&r2=1561307&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/humanres/widget/LookupScreens.xml (original)
+++ ofbiz/branches/release12.04/applications/humanres/widget/LookupScreens.xml Sat Jan 25 13:36:46 2014
@@ -61,6 +61,12 @@
             <actions>
                 <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="title" value="${uiLabelMap.HumanResLookupEmplPositionByName}"/>
+                <set field="queryString" from-field="result.queryString"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
+                <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
+                <set field="entityName" value="EmplPosition"/>
+                <set field="searchFields" value="[emplPositionId, partyId, emplPositionTypeId]"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">

Modified: ofbiz/branches/release12.04/applications/humanres/widget/forms/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/humanres/widget/forms/LookupForms.xml?rev=1561307&r1=1561306&r2=1561307&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/humanres/widget/forms/LookupForms.xml (original)
+++ ofbiz/branches/release12.04/applications/humanres/widget/forms/LookupForms.xml Sat Jan 25 13:36:46 2014
@@ -82,12 +82,12 @@ under the License.
         <auto-fields-entity entity-name="EmplPosition" default-field-type="hidden"/>
         <field name="emplPositionId" title="${uiLabelMap.HumanResEmplPositionId}"><text-find/></field>
         <field name="statusId">
-            <drop-down allow-empty="false">
+            <drop-down allow-empty="true">
                 <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem"></entity-options>
             </drop-down>
         </field>
         <field name="emplPositionTypeId">
-            <drop-down allow-empty="false">
+            <drop-down allow-empty="true">
                 <entity-options description="${description}" key-field-name="emplPositionTypeId" entity-name="EmplPositionType"></entity-options>
             </drop-down>
         </field>