svn commit: r804442 - in /ofbiz/branches/release09.04: ./ applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl

Author: jleroux
Date: Sat Aug 15 08:14:27 2009
New Revision: 804442

URL: http://svn.apache.org/viewvc?rev=804442&view=rev
Log:
"Applied fix from trunk for revision: 802346"
------------------------------------------------------------------------
r802346 | mor | 2009-08-08 13:56:06 +0200 (sam., 08 ao–t 2009) | 1 line

Fixed NPE.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 15 08:14:27 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,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,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,800461,800846,801023,804364
+/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,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,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,800461,800846,801023,802346,804364

Modified: ofbiz/branches/release09.04/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl?rev=804442&r1=804441&r2=804442&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl (original)
+++ ofbiz/branches/release09.04/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl Sat Aug 15 08:14:27 2009
@@ -42,7 +42,7 @@
                 <td><a href="/content/control/EditSurvey?surveyId=${storeSurvey.surveyId}" class="buttontext">${survey.description?default("[" + survey.surveyId + "]")}</a>
                 <td>${storeSurvey.productId?default("${uiLabelMap.CommonNA}")}</td>
                 <td>${storeSurvey.productCategoryId?default("${uiLabelMap.CommonNA}")}</td>
-                <td>${storeSurvey.fromDate?string}</td>
+                <td>${storeSurvey.fromDate?if_exists?string}</td>
                 <td>${storeSurvey.sequenceNum?if_exists}</td>
                 <td>
                   <form name="deleteProductStoreSurveyAppl_${storeSurvey_index}" method="post" action="<@ofbizUrl>deleteProductStoreSurveyAppl</@ofbizUrl>">