Author: jleroux
Date: Mon May 17 08:26:29 2010
New Revision: 945015
URL: http://svn.apache.org/viewvc?rev=945015&view=rev
Log:
"Applied fix from trunk for revision: 945010"
------------------------------------------------------------------------
r945010 | jleroux | 2010-05-17 10:14:14 +0200 (lun. 17 mai 2010) | 2 lignes
This presentation="window" were missing in r944647 and r944648. We still need
them for recursive cases.
And I just found that when we use a popup lookup we can't call layered lookups
from it.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/applications/content/widget/content/ContentForms.xml
ofbiz/branches/release10.04/applications/workeffort/widget/LookupForms.xml
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 17 08:26:29 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010
Modified:
ofbiz/branches/release10.04/applications/content/widget/content/ContentForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/widget/content/ContentForms.xml?rev=945015&r1=945014&r2=945015&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/content/widget/content/ContentForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/content/widget/content/ContentForms.xml
Mon May 17 08:26:29 2010
@@ -43,10 +43,10 @@ under the License.
</drop-down>
</field>
<field name="dataResourceId" position="1">
- <lookup target-form-name="LookupDataResource"/>
+ <lookup presentation="window"
target-form-name="LookupDataResource"/>
</field>
<field name="ownerContentId" position="2">
- <lookup target-form-name="LookupContent"/>
+ <lookup presentation="window" target-form-name="LookupContent"/>
</field>
<field name="statusId">
<drop-down allow-empty="true">
@@ -56,7 +56,7 @@ under the License.
</entity-options>
</drop-down>
</field>
- <field name="createdByUserLogin" position="2"><lookup
target-form-name="LookupPerson"/></field>
+ <field name="createdByUserLogin" position="2"><lookup
presentation="window" target-form-name="LookupPerson"/></field>
<field name="localeString">
<drop-down allow-empty="true">
<entity-options entity-name="CountryCode"
description="${countryName} [${countryCode}]" key-field-name="countryCode">
Modified:
ofbiz/branches/release10.04/applications/workeffort/widget/LookupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/workeffort/widget/LookupForms.xml?rev=945015&r1=945014&r2=945015&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/workeffort/widget/LookupForms.xml
(original)
+++ ofbiz/branches/release10.04/applications/workeffort/widget/LookupForms.xml
Mon May 17 08:26:29 2010
@@ -58,7 +58,7 @@ under the License.
</entity-options>
</drop-down>
</field>
- <field name="workEffortParentId"><lookup
target-form-name="LookupWorkEffort"/></field>
+ <field name="workEffortParentId"><lookup presentation="window"
target-form-name="LookupWorkEffort"/></field>
<field name="facilityId"><lookup
target-form-name="LookupFacility"/></field>
<field name="fixedAssetId"><lookup
target-form-name="LookupFixedAsset"/></field>
<field name="scopeEnumId">
