You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Pierre Smits <pi...@gmail.com> on 2016/09/27 11:39:17 UTC
Re: svn commit: r1750046 - in /ofbiz/branches/release15.12: ./ applications/party/widget/partymgr/LookupScreens.xml
Jacques,
In r1750046 accidentally the following got committed to release branch
15.12:
{code}
<script location="component://party/groovyScripts/party/StatusCondition.
groovy"/>
{code}
The script file doesn't exist in that location.
Probably the entire commit needs to be reverted.
Best regards,
Pierre Smits
ORRTIZ.COM <http://www.orrtiz.com>
OFBiz based solutions & services
OFBiz Extensions Marketplace
http://oem.ofbizci.net/oci-2/
On Fri, Jun 24, 2016 at 9:03 AM, <jl...@apache.org> wrote:
> Author: jleroux
> Date: Fri Jun 24 07:03:33 2016
> New Revision: 1750046
>
> URL: http://svn.apache.org/viewvc?rev=1750046&view=rev
> Log:
> "Applied fix from trunk for revision: 1750045"
> ------------------------------------------------------------------------
> r1750045 | jleroux | 2016-06-24 09:00:34 +0200 (ven. 24 juin 2016) | 12
> lignes
>
> A modified patch from Ankush Upadhyay for "auto-completer does not work to
> search Contact Party Id" - https://issues.apache.org/
> jira/browse/OFBIZ-7576
>
> Steps to reproduce:
> 1. Login to party manager.
> 2. Search Company party and navigate to profile.
> 3. Click on create new link of List Related Contacts screenlet.
> 4. Search any contact party using auto-completer.
>
> Expected behavior: auto-completer should work and return results like
> lookup does.
>
>
> jleroux: I use a simple quote (') instead of everywhere in the
> LookupScreens.xml. Also removes trailing blanks
> ------------------------------------------------------------------------
>
>
> Modified:
> ofbiz/branches/release15.12/ (props changed)
> ofbiz/branches/release15.12/applications/party/widget/
> partymgr/LookupScreens.xml
>
> Propchange: ofbiz/branches/release15.12/
> ------------------------------------------------------------
> ------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Fri Jun 24 07:03:33 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,1744873,
> 1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,
> 1746228,
> 1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,
> 1746805,1746832,1746890,1747223,1747349,1747498,1747639,1747642,1747646,
> 1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,
> 1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,
> 1748693,1748703,1748837,1748854,1748907,1748925,1748929,1748944,1748972,
> 1749026,1749083,1749092,1749111,1749220,1749282,1749519,1749525,1749543,
> 1749546,1749552,1749704
> +/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,1744873,
> 1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,
> 1746228,
> 1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,
> 1746805,1746832,1746890,1747223,1747349,1747498,1747639,1747642,1747646,
> 1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,
> 1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,
> 1748693,1748703,1748837,1748854,1748907,1748925,1748929,1748944,1748972,
> 1749026,1749083,1749092,1749111,1749220,1749282,1749519,1749525,1749543,
> 1749546,1749552,1749704,1750045
>
> Modified: ofbiz/branches/release15.12/applications/party/widget/
> partymgr/LookupScreens.xml
> URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/
> applications/party/widget/partymgr/LookupScreens.xml?
> rev=1750046&r1=1750045&r2=1750046&view=diff
> ============================================================
> ==================
> --- ofbiz/branches/release15.12/applications/party/widget/partymgr/LookupScreens.xml
> (original)
> +++ ofbiz/branches/release15.12/applications/party/widget/partymgr/LookupScreens.xml
> Fri Jun 24 07:03:33 2016
> @@ -101,7 +101,7 @@ under the License.
> <set field="viewSize" from-field="parameters.VIEW_SIZE"
> type="Integer" default-value="${viewSizeDefaultValue}"/>
> <set field="entityName" value="PartyRoleNameDetail"/>
> <set field="searchFields" value="[partyId, firstName,
> middleName, lastName, groupName]"/>
> - <set field="andCondition" value="${groovy: return
> org.ofbiz.entity.condition.EntityCondition.makeCondition("roleTypeId",
> "CUSTOMER")}"/>
> + <set field="andCondition" value="${groovy: return
> org.ofbiz.entity.condition.EntityCondition.makeCondition('roleTypeId',
> 'CUSTOMER')}"/>
> </actions>
> <widgets>
> <decorator-screen name="LookupDecorator"
> location="component://common/widget/CommonScreens.xml">
> @@ -178,6 +178,10 @@ under the License.
> <set field="title" value="${uiLabelMap.
> PartyLookupContact}"/>
> <set field="entityName" value="PartyRoleAndPartyDetail"/>
> <set field="parameters.roleTypeId" value="CONTACT"/>
> + <set field="searchFields" value="[partyId, firstName,
> middleName, lastName]"/>
> + <script location="component://party/groovyScripts/party/
> StatusCondition.groovy"/>
> + <set field="andCondition" value="${groovy: return
> org.ofbiz.entity.condition.EntityCondition.makeCondition([
> + org.ofbiz.entity.condition.
> EntityCondition.makeCondition('roleTypeId', 'CONTACT')])}"/>
> </actions>
> <widgets>
> <decorator-screen name="LookupDecorator"
> location="component://common/widget/CommonScreens.xml">
> @@ -411,7 +415,7 @@ under the License.
> <set field="searchFields" value="[partyId, groupName,
> partyGroupComments]"/>
> <script location="component://party/
> webapp/partymgr/WEB-INF/actions/party/StatusCondition.groovy"/>
> <set field="andCondition" value="${groovy: return
> org.ofbiz.entity.condition.EntityCondition.makeCondition(
> [context.andCondition,
> - org.ofbiz.entity.condition.
> EntityCondition.makeCondition("roleTypeId",
> "INTERNAL_ORGANIZATIO")])}"/>
> + org.ofbiz.entity.condition.
> EntityCondition.makeCondition('roleTypeId', 'INTERNAL_ORGANIZATIO')])}"/>
> </actions>
> <widgets>
> <decorator-screen name="LookupDecorator"
> location="component://common/widget/CommonScreens.xml">
>
>
>
Re: svn commit: r1750046 - in /ofbiz/branches/release15.12: ./
applications/party/widget/partymgr/LookupScreens.xml
Posted by Jacques Le Roux <ja...@les7arts.com>.
Thanks Pierre, fixed at r1762462
Jacques
Le 27/09/2016 � 13:39, Pierre Smits a �crit :
> Jacques,
>
> In r1750046 accidentally the following got committed to release branch
> 15.12:
> {code}
> <script location="component://party/groovyScripts/party/StatusCondition.
> groovy"/>
> {code}
>
> The script file doesn't exist in that location.
> Probably the entire commit needs to be reverted.
>
> Best regards,
>
> Pierre Smits
>
> ORRTIZ.COM <http://www.orrtiz.com>
> OFBiz based solutions & services
>
> OFBiz Extensions Marketplace
> http://oem.ofbizci.net/oci-2/
>
> On Fri, Jun 24, 2016 at 9:03 AM, <jl...@apache.org> wrote:
>
>> Author: jleroux
>> Date: Fri Jun 24 07:03:33 2016
>> New Revision: 1750046
>>
>> URL: http://svn.apache.org/viewvc?rev=1750046&view=rev
>> Log:
>> "Applied fix from trunk for revision: 1750045"
>> ------------------------------------------------------------------------
>> r1750045 | jleroux | 2016-06-24 09:00:34 +0200 (ven. 24 juin 2016) | 12
>> lignes
>>
>> A modified patch from Ankush Upadhyay for "auto-completer does not work to
>> search Contact Party Id" - https://issues.apache.org/
>> jira/browse/OFBIZ-7576
>>
>> Steps to reproduce:
>> 1. Login to party manager.
>> 2. Search Company party and navigate to profile.
>> 3. Click on create new link of List Related Contacts screenlet.
>> 4. Search any contact party using auto-completer.
>>
>> Expected behavior: auto-completer should work and return results like
>> lookup does.
>>
>>
>> jleroux: I use a simple quote (') instead of everywhere in the
>> LookupScreens.xml. Also removes trailing blanks
>> ------------------------------------------------------------------------
>>
>>
>> Modified:
>> ofbiz/branches/release15.12/ (props changed)
>> ofbiz/branches/release15.12/applications/party/widget/
>> partymgr/LookupScreens.xml
>>
>> Propchange: ofbiz/branches/release15.12/
>> ------------------------------------------------------------
>> ------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Fri Jun 24 07:03:33 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,1744873,
>> 1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,
>> 1746228,
>> 1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,
>> 1746805,1746832,1746890,1747223,1747349,1747498,1747639,1747642,1747646,
>> 1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,
>> 1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,
>> 1748693,1748703,1748837,1748854,1748907,1748925,1748929,1748944,1748972,
>> 1749026,1749083,1749092,1749111,1749220,1749282,1749519,1749525,1749543,
>> 1749546,1749552,1749704
>> +/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,1744873,
>> 1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,
>> 1746228,
>> 1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,
>> 1746805,1746832,1746890,1747223,1747349,1747498,1747639,1747642,1747646,
>> 1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,
>> 1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,
>> 1748693,1748703,1748837,1748854,1748907,1748925,1748929,1748944,1748972,
>> 1749026,1749083,1749092,1749111,1749220,1749282,1749519,1749525,1749543,
>> 1749546,1749552,1749704,1750045
>>
>> Modified: ofbiz/branches/release15.12/applications/party/widget/
>> partymgr/LookupScreens.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/
>> applications/party/widget/partymgr/LookupScreens.xml?
>> rev=1750046&r1=1750045&r2=1750046&view=diff
>> ============================================================
>> ==================
>> --- ofbiz/branches/release15.12/applications/party/widget/partymgr/LookupScreens.xml
>> (original)
>> +++ ofbiz/branches/release15.12/applications/party/widget/partymgr/LookupScreens.xml
>> Fri Jun 24 07:03:33 2016
>> @@ -101,7 +101,7 @@ under the License.
>> <set field="viewSize" from-field="parameters.VIEW_SIZE"
>> type="Integer" default-value="${viewSizeDefaultValue}"/>
>> <set field="entityName" value="PartyRoleNameDetail"/>
>> <set field="searchFields" value="[partyId, firstName,
>> middleName, lastName, groupName]"/>
>> - <set field="andCondition" value="${groovy: return
>> org.ofbiz.entity.condition.EntityCondition.makeCondition("roleTypeId",
>> "CUSTOMER")}"/>
>> + <set field="andCondition" value="${groovy: return
>> org.ofbiz.entity.condition.EntityCondition.makeCondition('roleTypeId',
>> 'CUSTOMER')}"/>
>> </actions>
>> <widgets>
>> <decorator-screen name="LookupDecorator"
>> location="component://common/widget/CommonScreens.xml">
>> @@ -178,6 +178,10 @@ under the License.
>> <set field="title" value="${uiLabelMap.
>> PartyLookupContact}"/>
>> <set field="entityName" value="PartyRoleAndPartyDetail"/>
>> <set field="parameters.roleTypeId" value="CONTACT"/>
>> + <set field="searchFields" value="[partyId, firstName,
>> middleName, lastName]"/>
>> + <script location="component://party/groovyScripts/party/
>> StatusCondition.groovy"/>
>> + <set field="andCondition" value="${groovy: return
>> org.ofbiz.entity.condition.EntityCondition.makeCondition([
>> + org.ofbiz.entity.condition.
>> EntityCondition.makeCondition('roleTypeId', 'CONTACT')])}"/>
>> </actions>
>> <widgets>
>> <decorator-screen name="LookupDecorator"
>> location="component://common/widget/CommonScreens.xml">
>> @@ -411,7 +415,7 @@ under the License.
>> <set field="searchFields" value="[partyId, groupName,
>> partyGroupComments]"/>
>> <script location="component://party/
>> webapp/partymgr/WEB-INF/actions/party/StatusCondition.groovy"/>
>> <set field="andCondition" value="${groovy: return
>> org.ofbiz.entity.condition.EntityCondition.makeCondition(
>> [context.andCondition,
>> - org.ofbiz.entity.condition.
>> EntityCondition.makeCondition("roleTypeId",
>> "INTERNAL_ORGANIZATIO")])}"/>
>> + org.ofbiz.entity.condition.
>> EntityCondition.makeCondition('roleTypeId', 'INTERNAL_ORGANIZATIO')])}"/>
>> </actions>
>> <widgets>
>> <decorator-screen name="LookupDecorator"
>> location="component://common/widget/CommonScreens.xml">
>>
>>
>>