Author: jleroux
Date: Thu Jun 2 11:34:29 2016
New Revision: 1746547
URL: http://svn.apache.org/viewvc?rev=1746547&view=rev
Log:
"Applied fix from trunk for revision: 1746536"
------------------------------------------------------------------------
r1746536 | jnicolas | 2016-06-02 10:39:28 +0200 (jeu. 02 juin 2016) | 1 ligne
OFBIZ-7160 correct typo javascrip
------------------------------------------------------------------------
Modified:
ofbiz/branches/release15.12/ (props changed)
ofbiz/branches/release15.12/specialpurpose/scrum/widget/ResourceForms.xml
ofbiz/branches/release15.12/specialpurpose/scrum/widget/scrumForms.xml
Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 2 11:34:29 2016
@@ -9,4 +9,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,1746422,
1746459,1746524,1746527
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,1746422,
1746459,1746524,1746527,1746536
Modified:
ofbiz/branches/release15.12/specialpurpose/scrum/widget/ResourceForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/scrum/widget/ResourceForms.xml?rev=1746547&r1=1746546&r2=1746547&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/scrum/widget/ResourceForms.xml
(original)
+++ ofbiz/branches/release15.12/specialpurpose/scrum/widget/ResourceForms.xml
Thu Jun 2 11:34:29 2016
@@ -294,7 +294,7 @@
<form name="UpdateCompanyAndOwner" type="single" extends="EditProduct"
extends-resource="component://scrum/widget/scrumForms.xml"
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="product!=null" target="UpdateCompanyAndOwner"/>
- <field name="partyId" title="${uiLabelMap.ScrumCompanyAndPerson}"
tooltip="${uiLabelMap.ScrumCompanyNameShow} - ${uiLabelMap.ScrumProductName}"
event="onchange"
action="javascrip:document.UpdateCompanyAndOwner.partyCompany.value=this.options[this.selectedIndex].text;"
parameter-name="partyId" use-when="companyCurrent!=null">
+ <field name="partyId" title="${uiLabelMap.ScrumCompanyAndPerson}"
tooltip="${uiLabelMap.ScrumCompanyNameShow} - ${uiLabelMap.ScrumProductName}"
event="onchange"
action="javascript:document.UpdateCompanyAndOwner.partyCompany.value=this.options[this.selectedIndex].text;"
parameter-name="partyId" use-when="companyCurrent!=null">
<drop-down allow-empty="false"
current-description="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}]
- ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName}
${companyCurrentList[0].middleName}" >
<option
key="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] -
${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName}
${companyCurrentList[0].middleName}(${companyCurrentList[0].partyId})"
description="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}]
- ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName}
${companyCurrentList[0].middleName}"/>
<option key="" description=""/>
Modified: ofbiz/branches/release15.12/specialpurpose/scrum/widget/scrumForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/scrum/widget/scrumForms.xml?rev=1746547&r1=1746546&r2=1746547&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/scrum/widget/scrumForms.xml
(original)
+++ ofbiz/branches/release15.12/specialpurpose/scrum/widget/scrumForms.xml Thu
Jun 2 11:34:29 2016
@@ -1467,13 +1467,13 @@ under the License.
</actions>
<alt-target use-when="product!=null" target="updateProduct"/>
<field name="partyCompany"><hidden/></field>
- <field name="partyId"
title="${uiLabelMap.ScrumCompanyAndProductOwner}"
tooltip="${uiLabelMap.ScrumCompanyNameShow} -- ${uiLabelMap.ScrumProductName}"
event="onchange"
action="javascrip:document.EditProduct.partyCompany.value=this.options[this.selectedIndex].text;"
parameter-name="partyId" use-when="companyCurrent==null">
+ <field name="partyId"
title="${uiLabelMap.ScrumCompanyAndProductOwner}"
tooltip="${uiLabelMap.ScrumCompanyNameShow} -- ${uiLabelMap.ScrumProductName}"
event="onchange"
action="javascript:document.EditProduct.partyCompany.value=this.options[this.selectedIndex].text;"
parameter-name="partyId" use-when="companyCurrent==null">
<drop-down allow-empty="false" >
<option key="" description="-select one-"/>
<list-options list-name="scrumRolesPersonAndCompanyList"
description="${groupName}[${partyIdFrom}] -- ${lastName} ${firstName}
${middleName}" key-name="partyId"/>
</drop-down>
</field>
- <field name="partyId"
title="${uiLabelMap.ScrumCompanyAndProductOwner}"
tooltip="${uiLabelMap.ScrumCompanyNameShow} - ${uiLabelMap.ScrumProductName}"
event="onchange"
action="javascrip:document.EditProduct.partyCompany.value=this.options[this.selectedIndex].text;"
parameter-name="partyId" use-when="companyCurrent!=null">
+ <field name="partyId"
title="${uiLabelMap.ScrumCompanyAndProductOwner}"
tooltip="${uiLabelMap.ScrumCompanyNameShow} - ${uiLabelMap.ScrumProductName}"
event="onchange"
action="javascript:document.EditProduct.partyCompany.value=this.options[this.selectedIndex].text;"
parameter-name="partyId" use-when="companyCurrent!=null">
<drop-down allow-empty="false"
current-description="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}]
- ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName}
${companyCurrentList[0].middleName}" >
<option
key="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] -
${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName}
${companyCurrentList[0].middleName}(${companyCurrentList[0].partyId})"
description="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}]
- ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName}
${companyCurrentList[0].middleName}"/>
<option key="" description=""/>
