svn commit: r1848472 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/humanres/webapp/humanres/WEB-INF/controller.xml applications/humanres/widget/EmployeeScreens.xml

[mbrohl]

Author: mbrohl
Date: Sat Dec  8 13:46:02 2018
New Revision: 1848472

URL: http://svn.apache.org/viewvc?rev=1848472&view=rev
Log:
Applied fix from trunk for revision: 1848469
===

Improved: Implement dependency from "State/Province" Field to "Country"
in New Employee Form.
(OFBIZ-10326)

Thanks Benjamin Jugl and Julian Leichert for reporting and providing
the patch.

Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/webapp/humanres/WEB-INF/controller.xml
    ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/widget/EmployeeScreens.xml

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  8 13:46:02 2018
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,1847890,1848263,
 1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,1847890,1848263,
 1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/webapp/humanres/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=1848472&r1=1848471&r2=1848472&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/webapp/humanres/WEB-INF/controller.xml Sat Dec  8 13:46:02 2018
@@ -753,6 +753,12 @@ under the License.
         <response name="success" type="view" value="EditAgreementEmploymentAppls"/>
     </request-map>
     <!--====================Extended Requests===================================-->
+    <request-map uri="getAssociatedStateList">
+        <security https="true" auth="false"/>
+        <event type="service" invoke="getAssociatedStateList"/>
+        <response name="success" type="request" value="json"/>
+        <response name="error" type="request" value="json"/>
+    </request-map>
     <request-map uri="EditPartySkillsExt">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="EditPartySkills"/>

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/widget/EmployeeScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/widget/EmployeeScreens.xml?rev=1848472&r1=1848471&r2=1848472&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/widget/EmployeeScreens.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/humanres/widget/EmployeeScreens.xml Sat Dec  8 13:46:02 2018
@@ -60,12 +60,25 @@ under the License.
             <actions>
                 <set field="titleProperty" value="PartyCreateNewEmployee"/>
                 <set field="headerItem" value="Employees"/>
-                <property-to-field field="defaultCountryGeoId" resource="general" property="country.geo.id.default" default="USA"/>
+                <set field="dependentForm" value="AddEmployee"/>
+                <set field="paramKey" value="countryGeoId"/>
+                <set field="mainId" value="countryGeoId"/>
+                <set field="dependentId" value="stateProvinceGeoId"/>
+                <set field="requestName" value="getAssociatedStateList"/>
+                <set field="responseName" value="stateList"/>
+                <set field="dependentKeyName" value="geoId"/>
+                <set field="descName" value="geoName"/>
+                <set field="selectedDependentOption" from-field="country.geo.id.default" default-value="USA"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.HumanResNewEmployee}">
+                        <platform-specific>
+                            <html>
+                                <html-template location="component://common-theme/template/includes/SetDependentDropdownValuesJs.ftl"/>
+                            </html>
+                        </platform-specific>
                             <section>
                                 <widgets>
                                     <include-form name="AddEmployee" location="component://humanres/widget/forms/EmployeeForms.xml"/>