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 2009/11/27 08:28:20 UTC
svn commit: r884761 - in /ofbiz/branches/release09.04: ./
applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
applications/product/webapp/catalog/product/ProductInventorySummary.ftl
Author: jleroux
Date: Fri Nov 27 07:28:20 2009
New Revision: 884761
URL: http://svn.apache.org/viewvc?rev=884761&view=rev
Log:
"Applied fix from trunk for revision: 884758"
------------------------------------------------------------------------
r884758 | jleroux | 2009-11-27 08:25:06 +0100 (ven. 27 nov. 2009) | 8 lignes
A patch from Arpit Singh Pandya "Error is not Handle for Inventory, if wrong productId is passed, it is breaking the ftl." (https://issues.apache.org/jira/browse/OFBIZ-3265) - OFBIZ-3265
Steps to generate the problem
- Go to https://demo.ofbiz.org/catalog/control/main
- In Right bar at Search Products section Leave Product Id.
- Select "Inventory" in "Product Jump" DropDown.
It is breaking the ProductInventorySummary.ftl and EditProductInventoryItems.ftl code.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
ofbiz/branches/release09.04/applications/product/webapp/catalog/product/ProductInventorySummary.ftl
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 27 07:28:20 2009
@@ -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,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,808786-808787,808792,809141,810370,810438,810465,810807,810809,810
814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,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
+/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,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,808786-808787,808792,809141,810370,810438,810465,810807,810809,810
814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,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
Modified: ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl?rev=884761&r1=884760&r2=884761&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl (original)
+++ ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl Fri Nov 27 07:28:20 2009
@@ -18,6 +18,7 @@
-->
<#assign externalKeyParam = "&externalLoginKey=" + requestAttributes.externalLoginKey?if_exists>
<div class="screenlet">
+ <#if product?exists>
<div class="screenlet-title-bar">
<h3>${uiLabelMap.ProductInventoryItems} ${uiLabelMap.CommonFor} <#if product?exists>${(product.internalName)?if_exists} </#if> [${uiLabelMap.CommonId}:${productId?if_exists}]</h3>
</div>
@@ -111,4 +112,7 @@
</table>
</#if>
</div>
+ <#else>
+ <h2>${uiLabelMap.ProductProductNotFound} ${productId?if_exists}!</h2>
+ </#if>
</div>
\ No newline at end of file
Modified: ofbiz/branches/release09.04/applications/product/webapp/catalog/product/ProductInventorySummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/catalog/product/ProductInventorySummary.ftl?rev=884761&r1=884760&r2=884761&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/webapp/catalog/product/ProductInventorySummary.ftl (original)
+++ ofbiz/branches/release09.04/applications/product/webapp/catalog/product/ProductInventorySummary.ftl Fri Nov 27 07:28:20 2009
@@ -22,6 +22,7 @@
<a href="EditProductInventoryItems?productId=${productId}&showAllFacilities=Y" class="buttontext">${uiLabelMap.ProductShowAllFacilities}</a>
</#if>
<div class="screenlet">
+ <#if product?exists>
<div class="screenlet-title-bar">
<h3>${uiLabelMap.ProductInventorySummary}</h3>
</div>
@@ -100,4 +101,7 @@
</#list>
</table>
</div>
+ <#else>
+ <h2>${uiLabelMap.ProductProductNotFound} ${productId?if_exists}!</h2>
+ </#if>
</div>