svn commit: r1763044 - in /ofbiz/trunk/applications/product/template: category/ product/ promo/

Author: jleroux
Date: Sun Oct  2 09:45:07 2016
New Revision: 1763044

URL: http://svn.apache.org/viewvc?rev=1763044&view=rev
Log:
Fixes: funny css value in html output
(OFBIZ-8312)

Go to
https://localhost:8443/catalog/control/EditProductFeatures?productId=WG-9943

In the webbrowser, show the html source. Found...
class="class org.apache.ofbiz.base.util.collections.MapStack"

Rohit: Uninitialize class variable causing problem while calling
htmlTemplate.renderDateTimeField macro. This patch fixes the problem.
I have replaced all the similar kind of occurrence from the code base.

jleroux: I added EditProductPromoStores.ftl


Thanks: Wai for report, Rohit Koushal for patch

Modified:
    ofbiz/trunk/applications/product/template/category/EditCategoryFeatureCats.ftl
    ofbiz/trunk/applications/product/template/category/EditCategoryParties.ftl
    ofbiz/trunk/applications/product/template/category/EditCategoryProdCatalogs.ftl
    ofbiz/trunk/applications/product/template/category/EditCategoryProducts.ftl
    ofbiz/trunk/applications/product/template/product/EditProductFeatures.ftl
    ofbiz/trunk/applications/product/template/promo/EditProductPromoStores.ftl

Modified: ofbiz/trunk/applications/product/template/category/EditCategoryFeatureCats.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/category/EditCategoryFeatureCats.ftl?rev=1763044&r1=1763043&r2=1763044&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/category/EditCategoryFeatureCats.ftl (original)
+++ ofbiz/trunk/applications/product/template/category/EditCategoryFeatureCats.ftl Sun Oct  2 09:45:07 2016
@@ -52,8 +52,8 @@ under the License.
                             <input type="hidden" name="productCategoryId" value="${(productFeatureCatGrpAppl.productCategoryId)!}" />
                             <input type="hidden" name="productFeatureGroupId" value="${(productFeatureCatGrpAppl.productFeatureGroupId)!}" />
                             <input type="hidden" name="fromDate" value="${(productFeatureCatGrpAppl.fromDate)!}" />
-                            <#if hasExpired><#assign class="alert"></#if>
-                            <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" value="${(productFeatureCatGrpAppl.thruDate)!}" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="22" maxlength="25" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+                            <#if hasExpired><#assign class="alert"><#else><#assign class=""></#if>
+                            <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" value="${(productFeatureCatGrpAppl.thruDate)!}" className="${class!}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="22" maxlength="25" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
                             <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;" />
                         </form>
                     </td>
@@ -131,8 +131,8 @@ under the License.
                             <input type="hidden" name="productCategoryId" value="${(productFeatureCategoryAppl.productCategoryId)!}" />
                             <input type="hidden" name="productFeatureCategoryId" value="${(productFeatureCategoryAppl.productFeatureCategoryId)!}" />
                             <input type="hidden" name="fromDate" value="${(productFeatureCategoryAppl.fromDate)!}" />
-                            <#if hasExpired><#assign class="alert"></#if>
-                            <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" value="${(productFeatureCategoryAppl.thruDate)!}" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="thruDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+                            <#if hasExpired><#assign class="alert"><#else><#assign class=""></#if>
+                            <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" value="${(productFeatureCategoryAppl.thruDate)!}" className="${class!}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="thruDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
                             <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;" />
                         </form>
                     </td>

Modified: ofbiz/trunk/applications/product/template/category/EditCategoryParties.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/category/EditCategoryParties.ftl?rev=1763044&r1=1763043&r2=1763044&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/category/EditCategoryParties.ftl (original)
+++ ofbiz/trunk/applications/product/template/category/EditCategoryParties.ftl Sun Oct  2 09:45:07 2016
@@ -50,8 +50,8 @@ under the License.
                     <input type="hidden" name="partyId" value="${(productCategoryRole.partyId)!}" />
                     <input type="hidden" name="roleTypeId" value="${(productCategoryRole.roleTypeId)!}" />
                     <input type="hidden" name="fromDate" value="${(productCategoryRole.getTimestamp("fromDate"))!}" />
-                    <#if hasExpired><#assign class="alert"></#if>
-                    <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productCategoryRole. getTimestamp('thruDate'))!}" size="25" maxlength="30" id="thruDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+                    <#if hasExpired><#assign class="alert"><#else><#assign class=""></#if>
+                    <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="${class!}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productCategoryRole. getTimestamp('thruDate'))!}" size="25" maxlength="30" id="thruDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
                     <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;" />
                 </form>
             </td>

Modified: ofbiz/trunk/applications/product/template/category/EditCategoryProdCatalogs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/category/EditCategoryProdCatalogs.ftl?rev=1763044&r1=1763043&r2=1763044&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/category/EditCategoryProdCatalogs.ftl (original)
+++ ofbiz/trunk/applications/product/template/category/EditCategoryProdCatalogs.ftl Sun Oct  2 09:45:07 2016
@@ -53,8 +53,8 @@ under the License.
                         <input type="hidden" name="productCategoryId" value="${(prodCatalogCategory.productCategoryId)!}"/>
                         <input type="hidden" name="prodCatalogCategoryTypeId" value="${prodCatalogCategory.prodCatalogCategoryTypeId}"/>
                         <input type="hidden" name="fromDate" value="${(prodCatalogCategory.fromDate)!}"/>
-                        <#if hasExpired><#assign class="alert"></#if>
-                        <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(prodCatalogCategory.thruDate)!}" size="25" maxlength="30" id="thruDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+                        <#if hasExpired><#assign class="alert"><#else><#assign class=""></#if>
+                        <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="${class!}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(prodCatalogCategory.thruDate)!}" size="25" maxlength="30" id="thruDate_1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
                         <input type="text" size="5" name="sequenceNum" value="${(prodCatalogCategory.sequenceNum)!}"/>
                         <input type="submit" value="${uiLabelMap.CommonUpdate}"/>
                     </form>

Modified: ofbiz/trunk/applications/product/template/category/EditCategoryProducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/category/EditCategoryProducts.ftl?rev=1763044&r1=1763043&r2=1763044&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/category/EditCategoryProducts.ftl (original)
+++ ofbiz/trunk/applications/product/template/category/EditCategoryProducts.ftl Sun Oct  2 09:45:07 2016
@@ -84,8 +84,8 @@ under the License.
                         <input type="hidden" name="productId${suffix}" value="${(productCategoryMember.productId)!}" />
                         <input type="hidden" name="productCategoryId${suffix}" value="${(productCategoryMember.productCategoryId)!}" />
                         <input type="hidden" name="fromDate${suffix}" value="${(productCategoryMember.fromDate)!}" />
-                        <#if hasExpired><#assign class="alert"></#if>
-                        <@htmlTemplate.renderDateTimeField name="thruDate${suffix}" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productCategoryMember.thruDate)!}" size="25" maxlength="30" id="thruDate${suffix}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+                        <#if hasExpired><#assign class="alert"><#else><#assign class=""></#if>
+                        <@htmlTemplate.renderDateTimeField name="thruDate${suffix}" event="" action="" className="${class!}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productCategoryMember.thruDate)!}" size="25" maxlength="30" id="thruDate${suffix}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
                         <input type="text" size="5" name="sequenceNum${suffix}" value="${(productCategoryMember.sequenceNum)!}" />
                         <input type="text" size="5" name="quantity${suffix}" value="${(productCategoryMember.quantity)!}" />
                         <br />

Modified: ofbiz/trunk/applications/product/template/product/EditProductFeatures.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/product/EditProductFeatures.ftl?rev=1763044&r1=1763043&r2=1763044&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/product/EditProductFeatures.ftl (original)
+++ ofbiz/trunk/applications/product/template/product/EditProductFeatures.ftl Sun Oct  2 09:45:07 2016
@@ -64,8 +64,8 @@ under the License.
           <td>
     <#assign hasExpired = false>
     <#if (productFeatureAndAppl.getTimestamp("thruDate"))?? && Static["org.apache.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(productFeatureAndAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if>
-            <#if hasExpired><#assign class="alert"></#if>
-            <@htmlTemplate.renderDateTimeField name="thruDate_o_${productFeatureAndAppl_index}" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productFeatureAndAppl.thruDate)!}" size="25" maxlength="30" id="thruDate_o_${productFeatureAndAppl_index}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+            <#if hasExpired><#assign class="alert"><#else><#assign class=""></#if>
+            <@htmlTemplate.renderDateTimeField name="thruDate_o_${productFeatureAndAppl_index}" event="" action="" className="${class!}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productFeatureAndAppl.thruDate)!}" size="25" maxlength="30" id="thruDate_o_${productFeatureAndAppl_index}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
             <input type="text" size='6' name='amount_o_${productFeatureAndAppl_index}' value='${(productFeatureAndAppl.amount)!}' />
             <input type="text" size='5' name='sequenceNum_o_${productFeatureAndAppl_index}' value='${(productFeatureAndAppl.sequenceNum)!}' />
             <select name='productFeatureApplTypeId_o_${productFeatureAndAppl_index}' size="1">

Modified: ofbiz/trunk/applications/product/template/promo/EditProductPromoStores.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/template/promo/EditProductPromoStores.ftl?rev=1763044&r1=1763043&r2=1763044&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/template/promo/EditProductPromoStores.ftl (original)
+++ ofbiz/trunk/applications/product/template/promo/EditProductPromoStores.ftl Sun Oct  2 09:45:07 2016
@@ -46,8 +46,8 @@ under the License.
                             <input type="hidden" name="productStoreId" value="${productStorePromoAppl.productStoreId}" />
                             <input type="hidden" name="productPromoId" value="${productStorePromoAppl.productPromoId}" />
                             <input type="hidden" name="fromDate" value="${productStorePromoAppl.fromDate}" />
-                            <#if hasExpired><#assign class="alert"></#if>
-                            <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productStorePromoAppl.thruDate)!}" size="25" maxlength="30" id="thruDate_${productStorePromoAppl_index}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+                            <#if hasExpired><#assign class="alert"><#else><#assign class=""></#if>
+                            <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="${class!}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productStorePromoAppl.thruDate)!}" size="25" maxlength="30" id="thruDate_${productStorePromoAppl_index}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
                             <input type="text" size="5" name="sequenceNum" value="${(productStorePromoAppl.sequenceNum)!}" />
                             <input type="submit" value="${uiLabelMap.CommonUpdate}" />
                         </form>