Author: jleroux Date: Wed Sep 16 21:46:49 2009 New Revision: 815978 URL: http://svn.apache.org/viewvc?rev=815978&view=rev Log: "Applied fix from trunk for revision: 815977" ------------------------------------------------------------------------ r815977 | jleroux | 2009-09-16 23:42:31 +0200 (mer. 16 sept. 2009) | 5 lignes
A patch from Ahmed Dini "Patch non-secure URL in EditCategoryProducts.ftl." (https://issues.apache.org/jira/browse/OFBIZ-2788) - OFBIZ-2788 How to regenerate the error:- Catalog Manager ->Under Browse Categories section, select a category with products->Products tab then try to delete one of the products by clicking on the delete button. I have reformatted all the block, I did not have enough courage to check the all file though... ------------------------------------------------------------------------ Modified: ofbiz/branches/release09.04/ (props changed) ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryProducts.ftl Propchange: ofbiz/branches/release09.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Sep 16 21:46:49 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,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,810814,810 832,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 +/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,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,810814,810 832,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 Modified: ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryProducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryProducts.ftl?rev=815978&r1=815977&r2=815978&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryProducts.ftl (original) +++ ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryProducts.ftl Wed Sep 16 21:46:49 2009 @@ -42,73 +42,75 @@ </div> <div class="screenlet-body"> <table cellspacing="0" class="basic-table"> - <tr class="header-row"> - <td>${uiLabelMap.ProductProductNameId}</td> - <td>${uiLabelMap.CommonFromDateTime}</td> - <td align="center">${uiLabelMap.ProductThruDateTimeSequenceQuantity} ${uiLabelMap.CommonComments}</td> - <td> </td> - </tr> - <#if (listSize > 0)> - <tr><td> - <form method="post" action="<@ofbizUrl>updateCategoryProductMember?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex}</@ofbizUrl>" name="updateCategoryProductForm"> - <input type="hidden" name="activeOnly" value="${activeOnly.toString()}"> - <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}"> - <#assign rowClass = "2"> - <#list productCategoryMembers as productCategoryMember> - <#assign suffix = "_o_" + productCategoryMember_index> - <#assign product = productCategoryMember.getRelatedOne("Product")> - <#assign hasntStarted = false> - <#if productCategoryMember.fromDate?exists && nowTimestamp.before(productCategoryMember.getTimestamp("fromDate"))><#assign hasntStarted = true></#if> - <#assign hasExpired = false> - <#if productCategoryMember.thruDate?exists && nowTimestamp.after(productCategoryMember.getTimestamp("thruDate"))><#assign hasExpired = true></#if> - <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <td> - <#if (product.smallImageUrl)?exists> - <a href="<@ofbizUrl>EditProduct?productId=${(productCategoryMember.productId)?if_exists}</@ofbizUrl>"><img alt="Small Image" src="<@ofbizContentUrl>${product.smallImageUrl}</@ofbizContentUrl>" height="40" width="40" align="middle"></a> - </#if> - <a href="<@ofbizUrl>EditProduct?productId=${(productCategoryMember.productId)?if_exists}</@ofbizUrl>" class="buttontext"><#if product?exists>${(product.internalName)?if_exists}</#if> [${(productCategoryMember.productId)?if_exists}]</a> - </td> - <td <#if hasntStarted> style="color: red;"</#if>>${(productCategoryMember.fromDate)?if_exists}</td> - <td align="center"> - <input type="hidden" name="productId${suffix}" value="${(productCategoryMember.productId)?if_exists}"> - <input type="hidden" name="productCategoryId${suffix}" value="${(productCategoryMember.productCategoryId)?if_exists}"> - <input type="hidden" name="fromDate${suffix}" value="${(productCategoryMember.fromDate)?if_exists}"> - <input type="text" size="25" name="thruDate${suffix}" value="${(productCategoryMember.thruDate)?if_exists}" <#if hasExpired>style="color: red;"</#if>> - <a href="javascript:call_cal(document.updateCategoryProductForm.thruDate${suffix}, '${(productCategoryMember.thruDate)?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <input type="text" size="5" name="sequenceNum${suffix}" value="${(productCategoryMember.sequenceNum)?if_exists}"> - <input type="text" size="5" name="quantity${suffix}" value="${(productCategoryMember.quantity)?if_exists}"> - <br/> - <textarea name="comments${suffix}" rows="2" cols="40">${(productCategoryMember.comments)?if_exists}</textarea> - </td> - <td align="center"> - <a href="javascript:document.deleteProductFromCategory_${productCategoryMember.productId}.submit();" class="buttontext">${uiLabelMap.CommonDelete}</a> - </td> - </tr> - <#-- toggle the row color --> - <#if rowClass == "2"> - <#assign rowClass = "1"> - <#else> - <#assign rowClass = "2"> - </#if> - </#list> - <tr valign="middle"> - <td colspan="4" align="center"> - <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;"> - <input type="hidden" value="${productCategoryMembers.size()}" name="_rowCount"> - </td> - </tr> - </form> - <#list productCategoryMembers as productCategoryMember> - <form name="deleteProductFromCategory_${productCategoryMember.productId}" method="post" action="<@ofbizUrl>removeCategoryProductMember</@ofbizUrl>"> - <input type="hidden" name="VIEW_SIZE" value="${viewSize}"/> - <input type="hidden" name="VIEW_INDEX" value="${viewIndex}"/> - <input type="hidden" name="productId" value="${(productCategoryMember.productId)?if_exists}"/> - <input type="hidden" name="productCategoryId" value="${(productCategoryMember.productCategoryId)?if_exists}"/> - <input type="hidden" name="fromDate" value="${(productCategoryMember.fromDate)?if_exists}"/> - <input name="activeOnly" type="hidden" value="${activeOnly.toString()}"/> - </form> - </#list> - </#if> + <tr class="header-row"> + <td>${uiLabelMap.ProductProductNameId}</td> + <td>${uiLabelMap.CommonFromDateTime}</td> + <td align="center">${uiLabelMap.ProductThruDateTimeSequenceQuantity} ${uiLabelMap.CommonComments}</td> + <td> </td> + </tr> + <#if (listSize > 0)> + <tr><td> + <#assign rowClass = "2"> + <#assign rowCount = 0> + <#list productCategoryMembers as productCategoryMember> + <#assign suffix = "_o_" + productCategoryMember_index> + <#assign product = productCategoryMember.getRelatedOne("Product")> + <#assign hasntStarted = false> + <#if productCategoryMember.fromDate?exists && nowTimestamp.before(productCategoryMember.getTimestamp("fromDate"))><#assign hasntStarted = true></#if> + <#assign hasExpired = false> + <#if productCategoryMember.thruDate?exists && nowTimestamp.after(productCategoryMember.getTimestamp("thruDate"))><#assign hasExpired = true></#if> + <form method="post" action="<@ofbizUrl>updateCategoryProductMember</@ofbizUrl>" name="updateCategoryProductForm"> + <input type="hidden" name="VIEW_SIZE" value="${viewSize}"/> + <input type="hidden" name="VIEW_INDEX" value="${viewIndex}"/> + <input type="hidden" name="activeOnly" value="${activeOnly.toString()}"> + <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}"> + <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> + <td> + <#if (product.smallImageUrl)?exists> + <a href="<@ofbizUrl>EditProduct?productId=${(productCategoryMember.productId)?if_exists}</@ofbizUrl>"><img alt="Small Image" src="<@ofbizContentUrl>${product.smallImageUrl}</@ofbizContentUrl>" height="40" width="40" align="middle"></a> + </#if> + <a href="<@ofbizUrl>EditProduct?productId=${(productCategoryMember.productId)?if_exists}</@ofbizUrl>" class="buttontext"><#if product?exists>${(product.internalName)?if_exists}</#if> [${(productCategoryMember.productId)?if_exists}]</a> + </td> + <td <#if hasntStarted> style="color: red;"</#if>>${(productCategoryMember.fromDate)?if_exists}</td> + <td align="center"> + <input type="hidden" name="productId${suffix}" value="${(productCategoryMember.productId)?if_exists}"> + <input type="hidden" name="productCategoryId${suffix}" value="${(productCategoryMember.productCategoryId)?if_exists}"> + <input type="hidden" name="fromDate${suffix}" value="${(productCategoryMember.fromDate)?if_exists}"> + <input type="text" size="25" name="thruDate${suffix}" value="${(productCategoryMember.thruDate)?if_exists}" <#if hasExpired>style="color: red;"</#if>> + <a href="javascript:call_cal(document.updateCategoryProductForm.thruDate${suffix}, '${(productCategoryMember.thruDate)?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> + <input type="text" size="5" name="sequenceNum${suffix}" value="${(productCategoryMember.sequenceNum)?if_exists}"> + <input type="text" size="5" name="quantity${suffix}" value="${(productCategoryMember.quantity)?if_exists}"> + <br/> + <textarea name="comments${suffix}" rows="2" cols="40">${(productCategoryMember.comments)?if_exists}</textarea> + </td> + <td align="center"> + <a href="javascript:document.deleteProductFromCategory_o_${rowCount}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> + </td> + </tr> + <#-- toggle the row color --> + <#if rowClass == "2"> + <#assign rowClass = "1"> + <#else> + <#assign rowClass = "2"> + </#if> + <tr valign="middle"> + <td colspan="4" align="center"> + <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;"> + <input type="hidden" value="${productCategoryMembers.size()}" name="_rowCount"> + </td> + </tr> + </form> + <form name="deleteProductFromCategory_o_${rowCount}" method="post" action="<@ofbizUrl>removeCategoryProductMember</@ofbizUrl>"> + <input type="hidden" name="VIEW_SIZE" value="${viewSize}"/> + <input type="hidden" name="VIEW_INDEX" value="${viewIndex}"/> + <input type="hidden" name="productId" value="${(productCategoryMember.productId)?if_exists}"> + <input type="hidden" name="productCategoryId" value="${(productCategoryMember.productCategoryId)?if_exists}"/> + <input type="hidden" name="fromDate" value="${productCategoryMember.getString("fromDate")?if_exists}"/> + <input type="hidden" name="activeOnly" value="${activeOnly.toString()}"/> + </form> + <#assign rowCount = rowCount + 1> + </#list> + </#if> </table> </div> <div class="screenlet-title-bar"> @@ -223,4 +225,4 @@ </td></tr> </table> </div> -</div> \ No newline at end of file +</div>
