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 2010/04/12 11:18:09 UTC

svn commit: r933159 - in /ofbiz/branches/release09.04: ./ applications/humanres/widget/forms/EmploymentAppForms.xml

Author: jleroux
Date: Mon Apr 12 09:18:09 2010
New Revision: 933159

URL: http://svn.apache.org/viewvc?rev=933159&view=rev
Log:
"Applied fix from trunk for revision: 933157" 
------------------------------------------------------------------------
r933157 | jleroux | 2010-04-12 11:14:27 +0200 (lun. 12 avr. 2010) | 4 lignes

A patch from Bob Morley "Creating New Employment Application (non secure)" https://issues.apache.org/jira/browse/OFBIZ-2894 - OFBIZ-2894

Removes the query string parms from the form action. The applicationId was already in the form but the partyId had to be added.

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


Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/humanres/widget/forms/EmploymentAppForms.xml

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 12 09:18:09 2010
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,771477,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,806914,808786-808787,808792,809141,810370,810438,810465,810
 807,810809,810814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,812724,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587,889666,890050,890107,890245,891378,891620,896649,899188,899833,900024,900026,900050,900217,900273,901628,907342-907343,910460,912587,915332,916252,916703,916925,917435,922042,923828,927870,928037,92816
 6,928171,928180,928470,928477,929582
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,771477,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,806914,808786-808787,808792,809141,810370,810438,810465,810
 807,810809,810814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,812724,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587,889666,890050,890107,890245,891378,891620,896649,899188,899833,900024,900026,900050,900217,900273,901628,907342-907343,910460,912587,915332,916252,916703,916925,917435,922042,923828,927870,928037,92816
 6,928171,928180,928470,928477,929582,933157

Modified: ofbiz/branches/release09.04/applications/humanres/widget/forms/EmploymentAppForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/humanres/widget/forms/EmploymentAppForms.xml?rev=933159&r1=933158&r2=933159&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/humanres/widget/forms/EmploymentAppForms.xml (original)
+++ ofbiz/branches/release09.04/applications/humanres/widget/forms/EmploymentAppForms.xml Mon Apr 12 09:18:09 2010
@@ -100,13 +100,14 @@ under the License.
          <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="AddEmploymentApp" type="single" target="createEmploymentApp?applicationId=${applicationId}&amp;&amp;partyId=${referredByPartyId}" default-entity-name="EmploymentApp" paginate-target="FindEmploymentApps"
+    <form name="AddEmploymentApp" type="single" target="createEmploymentApp" default-entity-name="EmploymentApp" paginate-target="FindEmploymentApps"
         header-row-style="header-row" default-table-style="basic-table">
         <actions>
             <set field="insideEmployee" from-field="parameters.insideEmployee"/>
         </actions>
         <alt-target use-when="insideEmployee != null" target="createEmploymentAppExt"/>
         <auto-fields-service service-name="createEmploymentApp" default-field-type="hidden"/>
+        <field name="partyId"><hidden value="${referredByPartyId}" /></field>
         <field name="applicationId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupEmploymentApp"/></field>
         <field name="emplPositionId"><lookup target-form-name="LookupEmplPosition"/></field>
         <field name="statusId">

Re: svn commit: r933159 - in /ofbiz/branches/release09.04: ./ applications/humanres/widget/forms/EmploymentAppForms.xml

Posted by Jacques Le Roux <ja...@les7arts.com>.
Hi Jacopo,

No problems, 09.04.1 sounds good to me, thanks for the information

Jacques

From: "Jacopo Cappellato" <ja...@gmail.com>
> Jacques,
>
> I am going to create the tag for the release 09.04 before this bug fix: this means that the bug fix will not be included in the 
> official release but of course it will be part of the next bug fix release for 09.04, if it will be released (as 09.04.1?).
> I am sorry but the package with all the signatures have been created some days before it and the vote on it was still running for 
> a few days when this fix has been committed yesterday.
>
> Jacopo
>
>
> On Apr 12, 2010, at 11:18 AM, jleroux@apache.org wrote:
>
>> Author: jleroux
>> Date: Mon Apr 12 09:18:09 2010
>> New Revision: 933159
>>
>> URL: http://svn.apache.org/viewvc?rev=933159&view=rev
>> Log:
>> "Applied fix from trunk for revision: 933157"
>> ------------------------------------------------------------------------
>> r933157 | jleroux | 2010-04-12 11:14:27 +0200 (lun. 12 avr. 2010) | 4 lignes
>>
>> A patch from Bob Morley "Creating New Employment Application (non secure)" https://issues.apache.org/jira/browse/OFBIZ-2894 - 
>> OFBIZ-2894
>>
>> Removes the query string parms from the form action. The applicationId was already in the form but the partyId had to be added.
>>
>> ------------------------------------------------------------------------
>> 
>>
>> Modified:
>>    ofbiz/branches/release09.04/   (props changed)
>>    ofbiz/branches/release09.04/applications/humanres/widget/forms/EmploymentAppForms.xml
>>
>> Propchange: ofbiz/branches/release09.04/
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Mon Apr 12 09:18:09 2010
>> @@ -1 +1 @@
>> -/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,771477,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,806914,808786-808787,808792,809141,810370,810438,810465,
 810
>> 807,810809,810814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,812724,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587,889666,890050,890107,890245,891378,891620,896649,899188,899833,900024,900026,900050,900217,900273,901628,907342-907343,910460,912587,915332,916252,916703,916925,917435,922042,923828,927870,928037,928
 16
>> 6,928171,928180,928470,928477,929582
>> +/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,771477,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,806914,808786-808787,808792,809141,810370,810438,810465,
 810
>> 807,810809,810814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,812724,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587,889666,890050,890107,890245,891378,891620,896649,899188,899833,900024,900026,900050,900217,900273,901628,907342-907343,910460,912587,915332,916252,916703,916925,917435,922042,923828,927870,928037,928
 16
>> 6,928171,928180,928470,928477,929582,933157
>>
>> Modified: ofbiz/branches/release09.04/applications/humanres/widget/forms/EmploymentAppForms.xml
>> URL: 
>> http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/humanres/widget/forms/EmploymentAppForms.xml?rev=933159&r1=933158&r2=933159&view=diff
>> ==============================================================================
>> --- ofbiz/branches/release09.04/applications/humanres/widget/forms/EmploymentAppForms.xml (original)
>> +++ ofbiz/branches/release09.04/applications/humanres/widget/forms/EmploymentAppForms.xml Mon Apr 12 09:18:09 2010
>> @@ -100,13 +100,14 @@ under the License.
>>          <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
>>         <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
>>     </form>
>> -    <form name="AddEmploymentApp" type="single" 
>> target="createEmploymentApp?applicationId=${applicationId}&amp;&amp;partyId=${referredByPartyId}" 
>> default-entity-name="EmploymentApp" paginate-target="FindEmploymentApps"
>> +    <form name="AddEmploymentApp" type="single" target="createEmploymentApp" default-entity-name="EmploymentApp" 
>> paginate-target="FindEmploymentApps"
>>         header-row-style="header-row" default-table-style="basic-table">
>>         <actions>
>>             <set field="insideEmployee" from-field="parameters.insideEmployee"/>
>>         </actions>
>>         <alt-target use-when="insideEmployee != null" target="createEmploymentAppExt"/>
>>         <auto-fields-service service-name="createEmploymentApp" default-field-type="hidden"/>
>> +        <field name="partyId"><hidden value="${referredByPartyId}" /></field>
>>         <field name="applicationId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup 
>> target-form-name="LookupEmploymentApp"/></field>
>>         <field name="emplPositionId"><lookup target-form-name="LookupEmplPosition"/></field>
>>         <field name="statusId">
>>
>>
>
>

Re: svn commit: r933159 - in /ofbiz/branches/release09.04: ./ applications/humanres/widget/forms/EmploymentAppForms.xml

Posted by Jacopo Cappellato <ja...@gmail.com>.
Jacques,

I am going to create the tag for the release 09.04 before this bug fix: this means that the bug fix will not be included in the official release but of course it will be part of the next bug fix release for 09.04, if it will be released (as 09.04.1?).
I am sorry but the package with all the signatures have been created some days before it and the vote on it was still running for a few days when this fix has been committed yesterday.

Jacopo


On Apr 12, 2010, at 11:18 AM, jleroux@apache.org wrote:

> Author: jleroux
> Date: Mon Apr 12 09:18:09 2010
> New Revision: 933159
> 
> URL: http://svn.apache.org/viewvc?rev=933159&view=rev
> Log:
> "Applied fix from trunk for revision: 933157" 
> ------------------------------------------------------------------------
> r933157 | jleroux | 2010-04-12 11:14:27 +0200 (lun. 12 avr. 2010) | 4 lignes
> 
> A patch from Bob Morley "Creating New Employment Application (non secure)" https://issues.apache.org/jira/browse/OFBIZ-2894 - OFBIZ-2894
> 
> Removes the query string parms from the form action. The applicationId was already in the form but the partyId had to be added.
> 
> ------------------------------------------------------------------------
> 
> 
> Modified:
>    ofbiz/branches/release09.04/   (props changed)
>    ofbiz/branches/release09.04/applications/humanres/widget/forms/EmploymentAppForms.xml
> 
> Propchange: ofbiz/branches/release09.04/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Mon Apr 12 09:18:09 2010
> @@ -1 +1 @@
> -/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,771477,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,806914,808786-808787,808792,809141,810370,810438,810465,810
> 807,810809,810814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,812724,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587,889666,890050,890107,890245,891378,891620,896649,899188,899833,900024,900026,900050,900217,900273,901628,907342-907343,910460,912587,915332,916252,916703,916925,917435,922042,923828,927870,928037,92816
> 6,928171,928180,928470,928477,929582
> +/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,771477,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,806914,808786-808787,808792,809141,810370,810438,810465,810
> 807,810809,810814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,812724,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587,889666,890050,890107,890245,891378,891620,896649,899188,899833,900024,900026,900050,900217,900273,901628,907342-907343,910460,912587,915332,916252,916703,916925,917435,922042,923828,927870,928037,92816
> 6,928171,928180,928470,928477,929582,933157
> 
> Modified: ofbiz/branches/release09.04/applications/humanres/widget/forms/EmploymentAppForms.xml
> URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/humanres/widget/forms/EmploymentAppForms.xml?rev=933159&r1=933158&r2=933159&view=diff
> ==============================================================================
> --- ofbiz/branches/release09.04/applications/humanres/widget/forms/EmploymentAppForms.xml (original)
> +++ ofbiz/branches/release09.04/applications/humanres/widget/forms/EmploymentAppForms.xml Mon Apr 12 09:18:09 2010
> @@ -100,13 +100,14 @@ under the License.
>          <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
>         <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
>     </form>
> -    <form name="AddEmploymentApp" type="single" target="createEmploymentApp?applicationId=${applicationId}&amp;&amp;partyId=${referredByPartyId}" default-entity-name="EmploymentApp" paginate-target="FindEmploymentApps"
> +    <form name="AddEmploymentApp" type="single" target="createEmploymentApp" default-entity-name="EmploymentApp" paginate-target="FindEmploymentApps"
>         header-row-style="header-row" default-table-style="basic-table">
>         <actions>
>             <set field="insideEmployee" from-field="parameters.insideEmployee"/>
>         </actions>
>         <alt-target use-when="insideEmployee != null" target="createEmploymentAppExt"/>
>         <auto-fields-service service-name="createEmploymentApp" default-field-type="hidden"/>
> +        <field name="partyId"><hidden value="${referredByPartyId}" /></field>
>         <field name="applicationId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupEmploymentApp"/></field>
>         <field name="emplPositionId"><lookup target-form-name="LookupEmplPosition"/></field>
>         <field name="statusId">
> 
>