You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2010/10/13 15:10:21 UTC
svn commit: r1022091 - in /ofbiz/trunk/applications/product/webapp/facility:
facility/FindFacilityLocation.ftl inventory/receiveInventory.ftl
returns/receiveReturn.ftl
Author: erwan
Date: Wed Oct 13 13:10:21 2010
New Revision: 1022091
URL: http://svn.apache.org/viewvc?rev=1022091&view=rev
Log:
Must prepare the field before passing it to freemarker macro, else it is just a string and the lookup is not displayed
Modified:
ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl
ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl?rev=1022091&r1=1022090&r2=1022091&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl Wed Oct 13 13:10:21 2010
@@ -36,7 +36,12 @@ under the License.
<tr>
<td class="label">${uiLabelMap.ProductLocationSeqId}</td>
<td>
- <@htmlTemplate.lookupField formName="findFacilityLocation" name="locationSeqId" id="locationSeqId" fieldFormName="LookupFacilityLocation<#if (facilityId?exists)>?facilityId=${facilityId}</#if>"/>
+ <#if parameters.facilityId?exists>
+ <#assign LookupFacilityLocationView="LookupFacilityLocation?facilityId=${facilityId}">
+ <#else>
+ <#assign LookupFacilityLocationView="LookupFacilityLocation">
+ </#if>
+ <@htmlTemplate.lookupField formName="findFacilityLocation" name="locationSeqId" id="locationSeqId" fieldFormName="${LookupFacilityLocationView}"/>
</td>
</tr>
<tr>
Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=1022091&r1=1022090&r2=1022091&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl Wed Oct 13 13:10:21 2010
@@ -202,7 +202,12 @@ under the License.
<option value="">${uiLabelMap.ProductNoLocation}</option>
</select>
<#else>
- <@htmlTemplate.lookupField formName="selectAllForm" name="locationSeqId" id="locationSeqId" fieldFormName="LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>"/>
+ <#if parameters.facilityId?exists>
+ <#assign LookupFacilityLocationView="LookupFacilityLocation?facilityId=${facilityId}">
+ <#else>
+ <#assign LookupFacilityLocationView="LookupFacilityLocation">
+ </#if>
+ <@htmlTemplate.lookupField formName="selectAllForm" name="locationSeqId_o_${rowCount}" id="locationSeqId_o_${rowCount}" fieldFormName="${LookupFacilityLocationView}"/>
</#if>
</td>
</tr>
@@ -404,7 +409,12 @@ under the License.
<option value="">${uiLabelMap.ProductNoLocation}</option>
</select>
<#else>
- <@htmlTemplate.lookupField formName="selectAllForm" name="locationSeqId_o_${rowCount}" id="locationSeqId_o_${rowCount}" fieldFormName="LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>"/>
+ <#if parameters.facilityId?exists>
+ <#assign LookupFacilityLocationView="LookupFacilityLocation?facilityId=${facilityId}">
+ <#else>
+ <#assign LookupFacilityLocationView="LookupFacilityLocation">
+ </#if>
+ <@htmlTemplate.lookupField formName="selectAllForm" name="locationSeqId_o_${rowCount}" id="locationSeqId_o_${rowCount}" fieldFormName="${LookupFacilityLocationView}"/>
</#if>
</td>
<td align="right">${uiLabelMap.ProductQtyReceived} :</td>
Modified: ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl?rev=1022091&r1=1022090&r2=1022091&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl Wed Oct 13 13:10:21 2010
@@ -150,7 +150,12 @@ under the License.
</select>
<#else>
<span>
- <@htmlTemplate.lookupField formName="selectAllForm" name="locationSeqId_o_${rowCount}" id="locationSeqId_o_${rowCount}" fieldFormName="LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>"/>
+ <#if parameters.facilityId?exists>
+ <#assign LookupFacilityLocationView="LookupFacilityLocation?facilityId=${facilityId}">
+ <#else>
+ <#assign LookupFacilityLocationView="LookupFacilityLocation">
+ </#if>
+ <@htmlTemplate.lookupField formName="selectAllForm" name="locationSeqId_o_${rowCount}" id="locationSeqId_o_${rowCount}" fieldFormName="${LookupFacilityLocationView}"/>
</span>
</#if>
</td>